enabled custom queue folder.

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

29 files changed, 7522 insertions, 7011 deletions

diff --git a/po/bg.po b/po/bg.po
index 1888132c..e8b8329e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+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,9 +20,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Четене на конфигурация за всеки акаунт...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "неуспешно записване на настройките във файл\n"
@@ -46,177 +46,177 @@ msgstr "създаване на IMAP4 връзка до %s:%d ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "Не може да се стартира TLS сесия.\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Изтриване на съобщение %d"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Изпращане на съобщение (%d / %d байта)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Копиране на съобщение %s%c%d във %s ...\n"
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Копиране на съобщение %s%c%d във %s ...\n"
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Получаване на съобщения от %s..."
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "не могат да се установят изтрити флагове: %s\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "не може да се заличи\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Получаване на съобщения от %s..."
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 msgid "can't set deleted flags: 1:*\n"
 msgstr "не могат да се установят изтрити флагове: 1:*\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 msgid "can't close folder\n"
 msgstr "не може да затвори папка\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "коренната папка %s не съществува\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 msgid "error occurred while getting LIST.\n"
 msgstr "грешка при получаване на LIST.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Не може да се създаде '%s'\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Не може да се създаде '%s' под Входящи\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Не може да се създаде пощенска кутия: LIST се провали\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "Не може да се създаде пощенска кутия\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "Не може да се преименува пощенска кутия: %s до %s\n"
 
-#: libsylph/imap.c:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "Не може да се изтрие пощенска кутия\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "не може да се вземе envelope\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Изпращане на съобщение (%d / %d байта)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "грешка при вземане на envelope.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "не може да се анализира envelope: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не може да се установи връзка с IMAP4 сървър: %s:%d\n"
 
-#: libsylph/imap.c:2475
+#: libsylph/imap.c:2487
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Не може да се установи IMAP4 сесия с:  %s:%d\n"
 
-#: libsylph/imap.c:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "не може да се получи пространството от имена\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "не може да се избере папка: %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "грешка при imap команда: CLOSE\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 удостоверяване провалено.\n"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 влизане провалено.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не може да се прибави %s към %s\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(изпращане на файл...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "съобщението не може да се прибави към %s\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не може да се копира %s в %s\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "грешка при imap команда: STORE %s %s\n"
 
-#: libsylph/imap.c:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "грешка при imap команда: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 msgid "error while imap command: CLOSE\n"
 msgstr "грешка при imap команда: CLOSE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не може да преобразува UTF-7 до %s\n"
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може да преобразува %s до UTF-7\n"
@@ -301,30 +301,30 @@ msgstr "пощенската кутия не може да се съкрати �
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Изнасяне на съобщения от %s във %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "не може да се копира съобщението %s във %s\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "Не може да се отвори файлът с маркировките.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "изходната папка е еднаква с назначението.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Копиране на съобщение %s%c%d във %s ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr ""
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -333,7 +333,7 @@ msgstr ""
 "Файлът `%s' вече съществува.\n"
 "Папката не може да се създаде."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -355,71 +355,71 @@ msgstr "създаване на NNTP връзка до %s:%d ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP връзката до %s:%d беше прекъсната. Свързване...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "статия %d е вече кеширана.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "взимане на статия %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "не може да се прочете статия %d\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "не може да се извлече списък на новинарска група\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "не може да се публикува статия.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "не може да се извлече статия %d\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "не може да се избере група %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, fuzzy, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "Невалиден обхват на статии: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "няма нови статии.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "получаване на xover %d - %d в %s...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "не може да се получи xover\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "грешка при получаването на xover.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "невалиден xover ред: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "не може да се получи xhdr\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "грешка при получаването на xhdr.\n"
 
@@ -515,16 +515,16 @@ msgstr "Папка"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr ""
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "не може да се отвори файлът с маркировките\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "не може да се вземе съобщението %d\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Невалиден команден ред за печат: `%s'\n"
@@ -712,12 +712,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Име"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Протокол"
 
@@ -725,7 +725,7 @@ msgstr "Протокол"
 msgid "Server"
 msgstr "Сървър"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Редактиране"
 
@@ -739,7 +739,7 @@ msgstr " Избиране като акаунт по подразбиране"
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Желаете ли да изтриете този акаунт?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Неозаглавен"
@@ -991,7 +991,7 @@ msgstr "E-Mail адрес"
 msgid "Address book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Име:"
 
@@ -1006,7 +1006,7 @@ msgstr "Изтриване"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Добавяне"
 
@@ -1180,7 +1180,7 @@ msgid "Group"
 msgstr "Група"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Папка"
 
@@ -1733,12 +1733,12 @@ msgid "MIME type"
 msgstr "MIME тип"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Изпращане"
@@ -1780,7 +1780,7 @@ msgid "Attach file"
 msgstr "Прикрепване на файл"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Сигнатура"
@@ -1993,7 +1993,7 @@ msgid " Check File "
 msgstr " Проверка на файл "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Файл"
 
@@ -2071,7 +2071,7 @@ msgid "Edit JPilot Entry"
 msgstr "Редактиране на JPilot запис"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2136,7 +2136,7 @@ msgstr "Пауза (сек)"
 msgid "Maximum Entries"
 msgstr "Максимум записи"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Основни"
 
@@ -2193,7 +2193,7 @@ msgid "Exporting file:"
 msgstr "Изходен файл:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr "Избор..."
 
@@ -3682,7 +3682,7 @@ msgstr "Приемане на нова поща от всички акаунти
 msgid "Send queued message(s)"
 msgstr "Изпращане на съобщенията в опашката"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Съставяне"
@@ -3707,7 +3707,7 @@ msgstr "На всички"
 msgid "Reply to all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Препращане"
 
@@ -3989,219 +3989,219 @@ msgstr ""
 "Неправилна парола! Опитайте отново...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Отваряне на прозорец с предпочитанията за акаунта...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Акаунт%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Предпочитания за нов акаунт"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Предпочитания за акаунт"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Създаване на прозорец с предпочитанията за акаунта...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Получаване"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Неприкосновеност"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Напреднал"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Име на акаунтът"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "Установяване като подразбиращ се"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Лична информация"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Пълно име"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "Пощенски адрес"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Организация"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Информация за сървъра"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "Новини (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Без (локално)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Сървърът изисква удостоверяване"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "Новинарски сървър"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Сървър за получаване"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "SMTP сървър (изпращане)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "Потребителски ID"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Парола"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Сървърът изисква удостоверяване"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Изтриване съобщенията от сървъра когато се получат"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "Премахване след"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "дни"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 дни: незабавно премахване)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Изтегляне на всички съобщения от сървъра"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "Ограничение на размера при получаване"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr "КB"
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Филтриране на съобщенията при получаване"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Входяща кутия"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Нефилтрираните съобщения ще бъдат съхранявани в тази папка)"
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "Метод на удостоверяване"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "Новини"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Максимален брой изтегляни статии\n"
 "(неограничено ако е въведена 0)"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Не е указан получател"
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "'Получаване всички' проверява за нови съобщения в този акаунт"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Заглавна част"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Добавяне на заглавна част Дата"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Генериране на Message-ID"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Добавяне на заглавна част от потребителя"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " Редактиране... "
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Удостоверяване"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Удостоверяване (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4210,178 +4210,191 @@ msgstr ""
 "Ако оставите тези полета празни, ще бъдат използвани\n"
 "същите user ID и парола като за получаване."
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Удостоверяване с POP3 преди изпращане"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 msgid "Command output"
 msgstr "Изход на команда"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Автоматично установяване на следните адреси"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Отговор-до"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Подписване по подразбиране"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "Криптиране по подразбиране"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "Използване на ASCII-armored формат за криптиране"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "Използване на подпис в чист текст"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Подписващ ключ"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Използване на подразбиращия се GnuPG ключ"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Избор на ключ по вашия email адрес"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Ръчен избор на ключ"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "ID на потребителя или ключа:"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "Не се използва SSL"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "Използване на SSL за POP3 връзка"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Използване на STARTTLS команда за старт на SSL сесия"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "Използване на SSL за IMAP4 връзка"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "Използване на SSL за NNTP връзка"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Изпращане (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "Използване на SSL за SMTP връзка"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr "Използване на неблокиращ SSL"
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(Изключете ако имате проблеми с SSL връзка)"
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "Определяне на SMTP порт"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "Определяне на POP3 порт"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "Определяне на IMAP4 порт"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "Определяне на NNTP порт"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Определяне на име на домейн"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "IMAP директория на сървъра"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "Поставяне на изпратени съобщения в"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "Поставяне на черновите в"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Поставяне на изтрити съобщения в"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "Поставяне на изтрити съобщения в"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "Не е въведено име на акаунта."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "Не е въведен пощенски адрес."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "Не е въведен SMTP сървър."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "Не е въведен потребителски ID."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "Не е въведен POP3 сървър."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "Не е въведен IMAP4 сървър."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "Не е въведен NNTP сървър."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5386,7 +5399,7 @@ msgstr "Стар Sylpheed"
 msgid "Custom header setting"
 msgstr "Собствена конфигурация на заглавни части"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr " Изтриване"
 
@@ -5442,221 +5455,221 @@ msgstr "Записване на конфигурацията за показва
 msgid "This header is already in the list."
 msgstr "Тази заглавна част е вече в списъка."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Установяване на филтър"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Желаете ли да изтриете правилото?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Изтриване на правило"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 #, fuzzy
 msgid "Filter rule"
 msgstr "Изтриване на правило"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 #, fuzzy
 msgid "Any header"
 msgstr "Скрити заглавни части"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 #, fuzzy
 msgid "Edit header..."
 msgstr "Заглавна част"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 #, fuzzy
 msgid "Message body"
 msgstr "Съобщение"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "съдържа"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 #, fuzzy
 msgid "doesn't contain"
 msgstr "не съдържа"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 #, fuzzy
 msgid "Move to"
 msgstr "Местене надолу"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 #, fuzzy
 msgid "Copy to"
 msgstr "/_Копиране..."
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Не се получава"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 #, fuzzy
 msgid "Delete from server"
 msgstr "Изтриване на папка"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 #, fuzzy
 msgid "Set mark"
 msgstr "Забележки"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 #, fuzzy
 msgid "Set color"
 msgstr "Определяне на цветове на съобщението"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 #, fuzzy
 msgid "Mark as read"
 msgstr "/_Маркиране/Маркиране като _прочетено"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/Пр_епращане като притурка"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 #, fuzzy
 msgid "Redirect"
 msgstr "/П_ренасочване"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 #, fuzzy
 msgid "Execute command"
 msgstr "Изпълняване"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 #, fuzzy
 msgid "folder:"
 msgstr "Папка"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 #, fuzzy
 msgid "day(s)"
 msgstr "дни"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 #, fuzzy
 msgid "address:"
 msgstr "Адрес"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 #, fuzzy
 msgid "Edit header list"
 msgstr "Заглавна част"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 #, fuzzy
 msgid "Headers"
 msgstr "Заглавна част"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 #, fuzzy
 msgid "Header:"
 msgstr "Заглавна част"
 
-#: src/prefs_filter_edit.c:1679
-#, fuzzy
-msgid "Rule name is not specified."
-msgstr "Не е указан получател"
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Не е въведен команден ред."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Не е указано назначение."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+#, fuzzy
+msgid "Rule name is not specified."
+msgstr "Не е указан получател"
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Не е въведен команден ред."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: файлът не съществува\n"
@@ -6103,15 +6116,20 @@ msgstr "само за четене"
 msgid "unknown"
 msgstr "непознат"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "Не може да се получи списък на новинарската група"
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Не може да се получи списък на новинарската група"
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Изпълнено."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d новинарски групи получени (%s прочетени)"
diff --git a/po/cs.po b/po/cs.po
index 9d0a9d78..95465083 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+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,9 +19,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Načítám nastavení pro všechny účty...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "Selhání při zápisu konfigurace do souboru\n"
@@ -45,181 +45,181 @@ msgstr "vytvářím spojení IMAP4 s %s:%d ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "Nelze spustit TLS sezení.\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Vymazávám zprávu %d"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Posílám zprávu (%d / %d bytů)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Přesouvám zprávu %s%c%d do %s...\n"
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopíruji zprávu %s%c%d do %s...\n"
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Získávám zprávy z %s do %s...\n"
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nelze nastavit příznak smazání: %d\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "nelze odstranit\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Získávám zprávy z %s do %s...\n"
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nelze nastavit příznak smazané: 1: %d\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "nelze vybrat složku: %s\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Označený soubor nebyl nalezen.\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 msgid "error occurred while getting LIST.\n"
 msgstr "Během příkazu LIST se vyskytla chyba.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Nemohu vytvořit '%s'\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Nemohu vytvořit '%s' v Doručené poště\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nelze vytvořit poštovní schránku: selhal příkaz LIST\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "nelze vytvořit poštovní schránku\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, 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:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "nelze smazat poštovní schránku\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "Nemohu načíst obálku\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Posílám zprávu (%d / %d bytů)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "Během načítání obálky se vyskytla chyba.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "Nemohu analyzovat obálku: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, 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:2475
+#: libsylph/imap.c:2487
 #, 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:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "nemohu najít obálku\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nelze vybrat složku: %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "chyba příkazu služby imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autentikace selhala."
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "Neúspěšné přihlášení k IMAP4.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "Nemohu přidat %s do %s\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(posílám soubor...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "nelze přidat zprávu %s\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nelze kopírovat %d na %s\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, 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:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "chyba příkazu služby imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "chyba příkazu služby imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nemůže konvertovat UTF-7 na %s\n"
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nemůže konvertovat %s na UTF-7\n"
@@ -304,30 +304,30 @@ msgstr "nemůžu smazat poštovní schránku.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportuji zprávy z %s do %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "Nemohu zkopírovat zprávu %s do %s\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "Nemohu otevřít označený soubor.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "zdrojová složka je stejná jako cílová.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopíruji zprávu %s%c%d do %s...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Poslední počet v adresáři %s = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -336,7 +336,7 @@ msgstr ""
 "Soubor '%s' už existuje.\n"
 "Nemohu vytvořit složku."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -358,71 +358,71 @@ msgstr "Vytvářím NNTP spojení s %s:%d ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP spojení %s:%d bylo přerušeno. Obnovuji spojení...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "příspěvek %d už byl v mezipaměti.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "Získávám příspěvek %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "Nemohu číst příspěvek %d\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "Nemohu načíst seznam diskuzních skupin\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "Nemohu odeslat příspěvek.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "Nemohu načíst příspěvek %d\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "Nemohu vybrat skupinu: %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neplatný rozsah příspěvků: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "Žádný nový příspěvek.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "získávám xover %d - %d v %s...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "nelze získat xover\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "Během získávání xover se vyskytla chyba.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "Neplatná xover řádka: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "nelze získat xhdr\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "Během získávání xhdr se vyskytla chyba .\n"
 
@@ -518,16 +518,16 @@ msgstr "Složka"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Neúspěšná konverze kódu.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "nelze otevřít označený soubor\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nelze načíst zprávu %d\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Neplatný příkazový řádek tisku: '%s'\n"
@@ -715,12 +715,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Jméno"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -728,7 +728,7 @@ msgstr "Protokol"
 msgid "Server"
 msgstr "Server"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Upravit"
 
@@ -742,7 +742,7 @@ msgstr " Nastavit účet jako výchozí "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Opravdu chcete tento účet smazat?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Neoznačený"
@@ -994,7 +994,7 @@ msgstr "E-mail adresa"
 msgid "Address book"
 msgstr "Databáze adres"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Jméno:"
 
@@ -1009,7 +1009,7 @@ msgstr "Smazat"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Přidat"
 
@@ -1181,7 +1181,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Složka"
 
@@ -1734,12 +1734,12 @@ msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Odeslat"
@@ -1781,7 +1781,7 @@ msgid "Attach file"
 msgstr "Připojí soubor"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Podpis"
@@ -1994,7 +1994,7 @@ msgid " Check File "
 msgstr " Otestovat soubor "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Soubor"
 
@@ -2073,7 +2073,7 @@ msgid "Edit JPilot Entry"
 msgstr "Upravit JPilot soubor"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2138,7 +2138,7 @@ msgstr "Timeout (vteřin)"
 msgid "Maximum Entries"
 msgstr "Maximum položek"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Základní"
 
@@ -2195,7 +2195,7 @@ msgid "Exporting file:"
 msgstr "Exportovaný soubor:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr " Vybrat... "
 
@@ -3686,7 +3686,7 @@ msgstr "Začlení novou poštu ze všech účtů"
 msgid "Send queued message(s)"
 msgstr "Odešle pozdrženou zprávu(y)"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Napsat"
@@ -3711,7 +3711,7 @@ msgstr "Odpov. všem"
 msgid "Reply to all"
 msgstr "Odpovídá všem"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Poslat dál"
 
@@ -3993,219 +3993,219 @@ msgstr ""
 "Špatná passphrase! Zkuste to znovu...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Otevření okna s nastavením účtu...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Účet%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Nastavení pro nový účet"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Nastavení účtu"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Vyvolání okna pro nastavení účtu...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Příjem"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Soukromí"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Rozšíření"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Název tohoto účtu"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "Nastavit jako výchozí"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Osobní informace"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Celé jméno"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "Poštovní adresa"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Organizace"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Informace o serveru"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Žádný (místní)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentizaci"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "News server"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Server pro příjem"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "SMTP server (odesílání)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "Uživatelské jméno"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Heslo"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Tento server vyžaduje autentizaci"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Smazat zprávy na serveru po jejich přijmutí"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "Odstranit po"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "dnech"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 dnů: odstranit ihned)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Přijmout všechny zprávy ze serveru"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "Limit velikosti pro příjem"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Filtr zpráv pro příjem"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Výchozí inbox"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nefiltrované zprávy budou uloženy v této složce)"
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "Metoda autentizace"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "Diskuzní skupiny"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maximální počet příspěvků pro stažení\n"
 "(0 pro neomezený počet)"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Není uveden příjemce."
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "Při volbě 'Stáhnout vše' zjistit nové zprávy"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Záhlaví"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Přidat do záhlaví pole s datumem"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Generovat číslo zprávy"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Přidat uživatelsky definované záhlaví"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " Upravit..."
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Autentizace"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP autentizace (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4214,177 +4214,190 @@ msgstr ""
 "Pokud necháte tyto položky prázdné, bude\n"
 "použito stejné jméno uživatele a heslo."
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentizace s POP3 před posláním"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 msgid "Command output"
 msgstr "Výstup příkazu"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastavit následující adresy"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Kopie"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Slepá kopie"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Odpovědět komu"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Vždy přidat podpis"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "Vždy zašifrovat zprávu"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "Použít formát ASCII-armored pro zašifrování"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "Použít čistý textový podpis"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Klíč pro podpis"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Použít výchozí GnuPG klíč"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Vybrat klíč podle email adresy"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Zadat klíč ručně"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "Uživatel nebo ID klíče:"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "Nepoužívat SSL"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "Použít SSL pro POP3 spojení"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Použít příkaz STARTTLS pro spuštění SSL relace"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "Použít SSL pro IMAP4 spojení"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "Použít SSL pro NNTP připojení"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Odesílání (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "Použít SSL pro SMTP připojení"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "Určete SMTP port"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "Určete POP3 port"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "Určete IMAP4 port"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "Určete NNTP port"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Určete název domény"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "adresář pro IMAP server"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "Ukládat odeslané zprávy do"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "Ukládat koncepty do"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Ukládat smazané zprávy do"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "Ukládat smazané zprávy do"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "Nebylo zadáno jméno účtu."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "Nebyla zadána poštovní adresa."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "Nebyl zadán SMTP server."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "Nebylo zadáno uživatelské číslo."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "Nebyl zadán POP3 server."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "Nebyl zadán IMAP4 server."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "Nebyl zadán NNTP server."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5389,7 +5402,7 @@ msgstr "Starý Sylpheed"
 msgid "Custom header setting"
 msgstr "Vlastní nastavení záhlaví"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr " Smazat "
 
@@ -5445,222 +5458,222 @@ msgstr "Zapisuji konfiguraci zobrazovaného záhlaví...\n"
 msgid "This header is already in the list."
 msgstr "Toto záhlaví je již v seznamu."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Nastavení filtru"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Opravdu chcete smazat toto pravidlo?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Smazat pravidlo"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 #, fuzzy
 msgid "Filter rule"
 msgstr "Smazat pravidlo"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 #, fuzzy
 msgid "Any header"
 msgstr "Všechna záhlaví"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 #, fuzzy
 msgid "Edit header..."
 msgstr "Záhlaví"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 #, fuzzy
 msgid "Message body"
 msgstr "Zpráva"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "obsahuje"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 #, fuzzy
 msgid "doesn't contain"
 msgstr "neobsahuje"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 #, fuzzy
 msgid "Move to"
 msgstr "Posunout dolů"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 #, fuzzy
 msgid "Copy to"
 msgstr "/_Kopírovat..."
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Nedoručit"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 #, fuzzy
 msgid "Delete from server"
 msgstr "Odebrat diskusní server"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 #, fuzzy
 msgid "Set mark"
 msgstr "Poznámky"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 #, fuzzy
 msgid "Set color"
 msgstr "Nastavení barev pro zprávy"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 #, fuzzy
 msgid "Mark as read"
 msgstr "/_Označit/Označit jako př_ečtené"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/Přeposlat _jako přílohu"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 #, fuzzy
 msgid "Redirect"
 msgstr "/Přes_měrovat"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 #, fuzzy
 msgid "Execute command"
 msgstr "Provést"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 #, fuzzy
 msgid "folder:"
 msgstr "Složka"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 #, fuzzy
 msgid "day(s)"
 msgstr "dnech"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 #, fuzzy
 msgid "address:"
 msgstr "Adresa"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 #, fuzzy
 msgid "Edit header list"
 msgstr "Záhlaví"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 #, fuzzy
 msgid "Headers"
 msgstr "Záhlaví"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 #, fuzzy
 msgid "Header:"
 msgstr "Záhlaví"
 
-#: src/prefs_filter_edit.c:1679
-#, fuzzy
-msgid "Rule name is not specified."
-msgstr "Není uveden příjemce."
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Není nastavena příkazová řádka."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Místo určení není nastavené."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+#, fuzzy
+msgid "Rule name is not specified."
+msgstr "Není uveden příjemce."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1823
 #, fuzzy
 msgid "Invalid action exists."
 msgstr "Nesprávný měsíc\n"
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Není nastavena příkazová řádka."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: soubor neexistuje\n"
@@ -6107,15 +6120,20 @@ msgstr "pouze pro čtení"
 msgid "unknown"
 msgstr "neznámý"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "vymazávám diskusní skupinu %s ...\n"
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Nemohu načíst seznam diskuzních skupin."
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Hotovo."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d diskuzních skupin přijato (%s čteno)"
@@ -7425,9 +7443,6 @@ msgstr ""
 #~ msgid "deleting folder %s ...\n"
 #~ msgstr "mažu složku %s ...\n"
 
-#~ msgid "deleting newsgroup %s ...\n"
-#~ msgstr "vymazávám diskusní skupinu %s ...\n"
-
 #~ msgid "The news server `%s' already exists."
 #~ msgstr "Diskuzní server '%s' již existuje."
 
diff --git a/po/da.po b/po/da.po
index 97e8c14f..342ba9c6 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -18,9 +18,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Læs konfiguration for hver konto...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "kunne ikke gemme konfiguration til fil\n"
@@ -44,179 +44,179 @@ msgstr "erstelle IMAP4-Verbindung zu %s:%d ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "Kan ikke starte TLS session.\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Sletter meddelelse %d"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Sender meddelelse (%d / %d bytes)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Flytter meddelelse %s%c%d til %s ...\n"
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopierer meddelelse %s%c%d til %s ...\n"
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Modtager meddelelse fra %s..."
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kan ikke sætte slettede flag: %s\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "kan ikke slette\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Modtager meddelelse fra %s..."
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kan ikke sætte slettet flag: 1:%d\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Markéret fil ikke fundet.\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 msgid "error occurred while getting LIST.\n"
 msgstr "fejl ved modtagelse af LIST.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "kan ikke oprette '%s'\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "kan ikke oprette '%s'\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan ikke oprette mailbox: LIST fejlet\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "kan ikke oprette mailbox\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan ikke omdøbe mailbox: %s til %s\n"
 
-#: libsylph/imap.c:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "kan ikke slette mailbox\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "kan ikke modtage kovert\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Sender meddelelse (%d / %d bytes)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "fejl ved modtagelse af kuvert.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kan ikke læse kuvert: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2475
+#: libsylph/imap.c:2487
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "kan ikke modtage namespace\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "fejl ved IMAP kommand: CLOSE\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 godkendelse fejlede.\n"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-Login fejlet.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan ikke tilføje %s til %s\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(sender fil...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "kan ikke tilføje meddelelse %s\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan ikke kopiere %s til %s\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "fejl ved IMAP kommando: STORE %s %s\n"
 
-#: libsylph/imap.c:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "fejl ved IMAP kommand: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 msgid "error while imap command: CLOSE\n"
 msgstr "fejl ved IMAP kommand: CLOSE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan ikke konvertere UTF-7 til %s\n"
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv can ikke konvertere %s til UTF-7\n"
@@ -303,30 +303,30 @@ msgstr "kan ikke tømme mailbox.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Eksporterer meddelelse fra %s til %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "kan ikke kopiere meddelelse %s til %s\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "Kan ikke åbne markéret fil.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "fra og til mappe er ens.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopierer meddelelse %s%c%d til %s ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Sidste nummer i sti %s = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -335,7 +335,7 @@ msgstr ""
 "Filen `%s' eksisterer allerede.\n"
 "Kan ikke oprette mappe."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -357,71 +357,71 @@ msgstr "oprettet NNTP forbindelse til %s:%d ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP forbindelse til %s:%d blev afbrudt. Genforbinder...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "Artikel %d er allerede gemt.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "modtager artikel %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "kann ikke læse artikel %d\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "kann ikke modtage nyhedsgruppe liste\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "kan ikke sende artikel.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "kan ikke modtage artikel %d\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "kan ikke vælge gruppe: %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ugyldigt artikel område: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "ingen nye artikler.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "modtager XOVER %d - %d i %s...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "kan ikke modtage XOVER\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "fejl ved modtagelse af XOVER.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "ugyldig XOVER linie: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "kan ikke modtage XHDR\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "fejl ved modtagelse af XHDR.\n"
 
@@ -519,16 +519,16 @@ msgstr "Mappe"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Tegnsæt konverteringsfejl.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "kan ikke åbne markéret fil\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kan ikke hente meddelelse %d\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Udskrift kommando er ugyldig: `%s'\n"
@@ -716,12 +716,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Navn"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -729,7 +729,7 @@ msgstr "Protokol"
 msgid "Server"
 msgstr "Server"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Redigér"
 
@@ -743,7 +743,7 @@ msgstr " Standard konto "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Vil du virkelig slette denne konto?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Uden titel"
@@ -995,7 +995,7 @@ msgstr "E-post adresse"
 msgid "Address book"
 msgstr "Adressebog"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Navn:"
 
@@ -1010,7 +1010,7 @@ msgstr "Slet"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Tilføj"
 
@@ -1178,7 +1178,7 @@ msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Mappe"
 
@@ -1731,12 +1731,12 @@ msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Send"
@@ -1778,7 +1778,7 @@ msgid "Attach file"
 msgstr "Vedhæft fil"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Underskrift"
@@ -1991,7 +1991,7 @@ msgid " Check File "
 msgstr " Check fil "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Fil"
 
@@ -2069,7 +2069,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redigér JPilot indtastning"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2134,7 +2134,7 @@ msgstr "Timeout (sek)"
 msgid "Maximum Entries"
 msgstr "Max. indtastninger"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Enkelt"
 
@@ -2191,7 +2191,7 @@ msgid "Exporting file:"
 msgstr "Eksporterer fil:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr " Vælg... "
 
@@ -3685,7 +3685,7 @@ msgstr "Hent ny post fra alle konti"
 msgid "Send queued message(s)"
 msgstr "Sender meddelelse(r) i kø"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Opret"
@@ -3710,7 +3710,7 @@ msgstr "Besvar alle"
 msgid "Reply to all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Videresend"
 
@@ -3992,217 +3992,217 @@ msgstr ""
 "Forkert adgangssætning! Prøv igen...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Åbner konti egenskaber...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Opsæt af ny konto"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Konto opsæt"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Opretter konto egenskaber...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Modtag"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Privat"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Navn på denne konto"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "Standard konto"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Personlige informationener"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Fuldt navn"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "E-post adresse"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Server data"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Ingen (lokal)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Dennes server kræver godkendelse"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "Nyheds server"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Server til modtagelse"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "SMTP server (afsendelse)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "Bruger ID"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Adgangskode"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Dennes server kræver godkendelse"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Slet meddelelser fra server efter modtagelse"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "Slet efter"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "dage"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 dage: slet straks)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Hent alle meddelelser fra server"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "Modtagelses størrelse maks."
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr "kB"
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Filtrere meddelelse ved modtagelse"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Standard indbakke"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Ufiltrerede meddelelser gemmes i denne mappe)"
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "Godkendelses metode"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "Nyheder"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr "Max antal artikler ved hentning (0 angiver alle)"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Mangler modtager"
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Hent alle' henter post fra denne konto"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Hoved"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Tilføj dato linie"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Opret meddelelses ID"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Tilføj bruger defineret hoved"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " Redigér... "
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Godkendelse"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP godkendelse (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4211,178 +4211,191 @@ msgstr ""
 "Hvis du lader disse være tomme, benyttes\n"
 "samme bruger ID og adgangskode som ved modtagelse."
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Godkend med POP3 før afsendelse"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 msgid "Command output"
 msgstr "Kommando tekst"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Udfyld automatisk følgende adresser"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Svar til"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Signer altid meddelelse"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "Krypter altid meddelelser"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "Benyt ASCII format til kodning"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "Benyt klar tekst underskrift"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Underskrifts nøgle"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Benyt standard GnuPg nøgle"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Vælg nøgle efter e-post adresse"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Angiv nøgle manuelt"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "Bruger eller nøgle ID"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "Benyt ikke SSL"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "Benyt SSL til POP3 forbindelse"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Benyt STARTTLS kommando til at starte SSL session"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "Benyt SSL til IMAP4 forbindelse"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "Benyt SSL til NNTP forbindelse"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Send (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "Benyt SSL til SMTP forbindelse"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr "Benyt ublokerende SSL"
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(Slp dette fra hvis du har problemer med SSL forbindelser)"
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "Angiv SMTP port"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "Angiv POP3 port"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "Angiv IMAP4 port"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "Angiv NNTP port"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Angiv domæne navn"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "IMAP server sti."
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "Gem sendte meddelelser i"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "Gem kladde i"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Gem slettede meddelelser i"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "Gem slettede meddelelser i"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "Konto navn er ikke angivet."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "E-post adresse ikke angivet."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "SMTP server ikke angivet."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "Bruger ID ikke angivet."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "POP3 server ikke angivet."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 server ikke angivet"
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "NNTP server ikke angivet."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5385,7 +5398,7 @@ msgstr "Gl. Sylpheed"
 msgid "Custom header setting"
 msgstr "Bruger defineret hoved opsæt"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr " Slet "
 
@@ -5441,221 +5454,221 @@ msgstr "Gem hoved konfiguration...\n"
 msgid "This header is already in the list."
 msgstr "Denne hoved linie er allerede på listen."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Filter opsæt"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Wollen Sie wirklich diese Regel Slet?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Slet regel"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 #, fuzzy
 msgid "Filter rule"
 msgstr "Slet regel"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 #, fuzzy
 msgid "Any header"
 msgstr "Alle hoved linier"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 #, fuzzy
 msgid "Edit header..."
 msgstr "Hoved"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 #, fuzzy
 msgid "Message body"
 msgstr "Meddelelse"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "indholder"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 #, fuzzy
 msgid "doesn't contain"
 msgstr "indholder ikke"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 #, fuzzy
 msgid "Move to"
 msgstr "Ned"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 #, fuzzy
 msgid "Copy to"
 msgstr "/_Kopier..."
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Modtag ikke"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 #, fuzzy
 msgid "Delete from server"
 msgstr "Slet mappe"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 #, fuzzy
 msgid "Set mark"
 msgstr "Kommentar"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 #, fuzzy
 msgid "Set color"
 msgstr "Angiv meddelelses farve"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 #, fuzzy
 msgid "Mark as read"
 msgstr "/_Markér/_Læst"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/Videresend som _vedhæftet"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 #, fuzzy
 msgid "Redirect"
 msgstr "/_Omdirigér"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 #, fuzzy
 msgid "Execute command"
 msgstr "Udfør"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 #, fuzzy
 msgid "folder:"
 msgstr "Mappe"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 #, fuzzy
 msgid "day(s)"
 msgstr "dage"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 #, fuzzy
 msgid "address:"
 msgstr "Adresse"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 #, fuzzy
 msgid "Edit header list"
 msgstr "Hoved"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 #, fuzzy
 msgid "Headers"
 msgstr "Hoved"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 #, fuzzy
 msgid "Header:"
 msgstr "Hoved"
 
-#: src/prefs_filter_edit.c:1679
-#, fuzzy
-msgid "Rule name is not specified."
-msgstr "Mangler modtager"
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Kommando linie ikke opsat."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Destination ikke valgt."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+#, fuzzy
+msgid "Rule name is not specified."
+msgstr "Mangler modtager"
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Kommando linie ikke opsat."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: fil findes ikke\n"
@@ -6105,15 +6118,20 @@ msgstr "kun læses"
 msgid "unknown"
 msgstr "ukendt"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "Kan ikke modtage gruppe liste."
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan ikke modtage gruppe liste."
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Afsluttet."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d Nyhedsgruppe(r) modtaget (%s læst)"
diff --git a/po/de.po b/po/de.po
index 8ae88ae6..fc374cac 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: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+0900\n"
 "PO-Revision-Date: 2005-11-19 08:34+0100\n"
 "Last-Translator: Fridtjof Busse <fridtjof@fbunet.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -20,9 +20,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Lese alle Einstellungen für jeden Account...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "konnte nicht in die Konfigurationsdatei schreiben\n"
@@ -45,176 +45,176 @@ msgstr "erstelle IMAP4-Verbindung zu %s:%d ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "Kann TLS-Sitzung nicht beginnen.\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, c-format
 msgid "Getting message %d"
 msgstr "Hole Nachricht %d"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Hänge Nachricht an %s (%d / %d)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Verschiebe Nachrichten %s nach %s ..."
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiere Nachrichten %s nach %s ..."
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, c-format
 msgid "Removing messages %s"
 msgstr "Entferne Nachrichten von %s..."
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kann gelöschte Flags nicht setzen: %s\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "kann nicht löschen\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Entferne alle Nachrichten in %s..."
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kann gelöschte Flags nicht setzen: 1:*\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 msgid "can't close folder\n"
 msgstr "kann Ablage nicht schließen\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "Wurzelverzeichnis %s existiert nicht\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 msgid "error occurred while getting LIST.\n"
 msgstr "Fehler beim Empfang von LIST.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Kann '%s' nicht erstellen\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Kann '%s' in INBOX nicht erstellen\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kann Mailbox nicht erstellen: LIST fehlgeschlagen\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "kann Mailbox nicht erstellen\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kann Mailbox %s nicht in %s umbenennen\n"
 
-#: libsylph/imap.c:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "kann Mailbox nicht löschen\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "kann die Nachrichteneigenschaften nicht empfangen\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Hole Nachrichtenkopfzeilen (%d / %d bytes)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "Fehler beim Empfang der Nachrichteneigenschaften.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kann die Nachrichteneigenschaften nicht bearbeiten: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Keine Verbindung mit IMAP4-Server: %s:%d\n"
 
-#: libsylph/imap.c:2475
+#: libsylph/imap.c:2487
 #, 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:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "kann Namensraum nicht empfangen\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kann Ablage %s nicht auswählen\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 msgid "error on imap command: STATUS\n"
 msgstr "Fehler beim IMAP-Befehl: STATUS\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4-Beglaubigung fehlgeschlagen.\n"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-Login fehlgeschlagen.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kann %s nicht an %s anhängen\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(Datei versenden...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kann Nachricht nicht anhängen an %s\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kann %s nicht nach %s kopieren\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Fehler beim IMAP-Befehl: STORE %s %s\n"
 
-#: libsylph/imap.c:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Fehler beim IMAP-Befehl: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 msgid "error while imap command: CLOSE\n"
 msgstr "Fehler beim IMAP-Befehl: CLOSE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kann UTF-7 nicht nach %s konvertieren\n"
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kann %s nicht nach UTF-7  konvertieren\n"
@@ -301,30 +301,30 @@ msgstr "Kann Mailbox nicht auf null setzen.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportiere Nachrichten von %s in %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "kann Nachricht %s nicht nach %s kopieren\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "Kann markierte Datei nicht öffnen.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "Die Quellablage ist identisch mit dem Ziel.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopiere Nachricht %s%c%d nach %s ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Letzte Nummer im Verzeichnis %s = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -333,7 +333,7 @@ msgstr ""
 "Datei '%s' existiert bereits.\n"
 "Kann Ablage nicht erstellen."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -361,71 +361,71 @@ msgstr "erstelle NNTP-Verbindung zu %s:%d ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP-Verbindung mit %s:%d wurde aufgehoben. Erneut verbinden...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "Artikel %d wurde schon zwischengespeichert.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "empfange Artikel %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "kann Artikel %d nicht lesen\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "kann die Newsgroup-Liste nicht empfangen\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "kann Artikel nicht senden.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "kann Artikel %d nicht empfangen\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "kann die Gruppe: %s nicht wählen\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ungültiger Artikelbereich: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "Keine neuen Artikel.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "bekomme Newsübersicht %d - %d in %s...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "kann Newsübersicht nicht bekommen\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "Fehler beim Empfang der Newsübersicht.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "ungültige Newsübersichtszeile: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "kann XHDR nicht bekommen\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "Fehler beim Empfang von XHDR.\n"
 
@@ -519,16 +519,16 @@ msgstr "Spam-Mail Filter"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Zeichensatzumsetzung fehlgeschlagen.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "kann markierte Datei nicht öffnen\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kann Nachricht %d nicht holen\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Druck-Befehlszeile ist ungültig: `%s'\n"
@@ -719,12 +719,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Name"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -732,7 +732,7 @@ msgstr "Protokoll"
 msgid "Server"
 msgstr "Server"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -745,7 +745,7 @@ msgstr "Setze als _Standardaccount "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Wollen Sie den Account '%s' wirklich löschen?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 msgid "(Untitled)"
 msgstr "Unbenannt"
 
@@ -996,7 +996,7 @@ msgstr "E-Mail Adresse"
 msgid "Address book"
 msgstr "Adressbuch"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Name:"
 
@@ -1011,7 +1011,7 @@ msgstr "Löschen"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -1184,7 +1184,7 @@ msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Ablage"
 
@@ -1702,12 +1702,12 @@ msgid "MIME type"
 msgstr "MIME-Typ"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Senden"
@@ -1749,7 +1749,7 @@ msgid "Attach file"
 msgstr "Datei anhängen"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Unterschrift"
@@ -1956,7 +1956,7 @@ msgid " Check File "
 msgstr " Datei überprüfen "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Datei"
 
@@ -2034,7 +2034,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot-Eintrag bearbeiten"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2099,7 +2099,7 @@ msgstr "Timeout (Sek.)"
 msgid "Maximum Entries"
 msgstr "Einträge (Max.)"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Einfach"
 
@@ -2156,7 +2156,7 @@ msgid "Exporting file:"
 msgstr "Exportiere Datei:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr " Auswählen... "
 
@@ -3615,7 +3615,7 @@ msgstr "Neue E-Mail aller Accounts aufnehmen"
 msgid "Send queued message(s)"
 msgstr "Senden wartender Nachrichten"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Verfassen"
@@ -3640,7 +3640,7 @@ msgstr "Alle beantworten"
 msgid "Reply to all"
 msgstr "Antwort an alle"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Weiterleiten"
 
@@ -3919,214 +3919,214 @@ msgstr ""
 "Falsches Mantra! Nochmal...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Öffne Accounteinstellungenfenster...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Einstellungen eines neuen Accounts"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Accounteinstellungen"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Erstelle Accounteinstellungenfenster...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Empfangen"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Privat"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Speziell"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Name dieses Accounts"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "Standard-Account"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Persönliche Informationen"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Vollständiger Name"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "E-Mail-Adresse"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Serverdaten"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Keiner (lokal)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Dieser Server benötigt Beglaubigung"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "Newsserver"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Server zum Empfangen"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "SMTP-Server (senden)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "Benutzer-ID"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Kennwort"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 msgid "Use secure authentication (APOP)"
 msgstr "Verwende sichere Beglaubigung (APOP)"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Nachrichten vom Server nach Empfang löschen"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "Entfernen nach"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "Tag(en)"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 Tage: sofort entfernen)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Lade alle Nachrichten vom Server herunter"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "Grenze für Nachrichtengöße beim Empfang"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Nachrichten beim Empfang filtern"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Standard Posteingang"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Ungefilterte Nachrichten werden in dieser Ablage gespeichert."
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "Beglaubigungsmethode"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 msgid "Maximum number of articles to download"
 msgstr "Maximum an herunterzuladenden Artikeln"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 msgid "No limit if 0 is specified."
 msgstr "Ohne Begrenzung, wenn 0 angegeben"
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr ""
 "`Hole alle' übeprüft ob neue Nachrichten für diesen Account vorhanden sind"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Kopfzeilen"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Füge Datum in Kopfzeile ein"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Erzeuge Nachrichten-ID"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Füge benutzerdefinierte Kopfzeile ein"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " Bearbeiten... "
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Beglaubigung"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-Beglaubigung (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4134,177 +4134,190 @@ msgstr ""
 "Wenn Sie diese Einträge frei lassen, wird\n"
 "dieselbe ID und dasselbe Passwort wie zum Empfang verwendet."
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Beglaubige mit POP3 vor dem Senden"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 msgid "Command output"
 msgstr "Befehlsausgabe"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Setze folgende Adressen automatisch"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Nachrichten immer digital unterschreiben"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "Nachrichten immer verschlüsseln"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr "Verschlüssele beim Antworten auf verschlüsselte Nachricht"
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "Benutze ASCII-Hüllen Format zum Verschlüsseln"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "Benutze digitale Klartext-Unterschrift"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Schlüssel für digitale Unterschrift"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Benutze voreingestellten GnuPG-Schlüssel"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Wähle Schlüssel nach E-Mail Adresse"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Schlüssel manuell angeben"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "Benutzer- oder Schlüssel-ID"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "SSL nicht benutzen"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "SSL für POP3-Verbindung benutzen"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Für SSL-Sitzung STARTTLS-Befehl benutzen"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL für IMAP4-Verbindung benutzen"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "SSL für NNTP-Verbindung benutzen"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Senden (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "SSL für SMTP-Verbindung benutzen"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr "Benutze non-blocking SSL"
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Ausschalten, wenn Probleme mit der SSL-Verbindung."
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "SMTP-Port angeben"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "POP3-Port angeben"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "IMAP4-Port angeben"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "NNTP-Port angeben"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Domännamen angeben"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "IMAP-Serververzeichnis."
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "Gesendete Nachrichten speichern in"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "Entwürfe speichern in"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Gelöschte Nachrichten speichern in"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "Gelöschte Nachrichten speichern in"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "Keine Account-Name angegeben."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "Keine E-Mail-Adresse angegeben."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "Keinen SMTP-Server angegeben."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "Keine Benutzer-ID angegeben."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "Keinen POP3-Server angegeben."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "Keinen IMAP4-Server angegeben."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "Keinen NNTP-Server angegeben."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5293,7 +5306,7 @@ msgstr "Altes Sylpheed"
 msgid "Custom header setting"
 msgstr "Benutzerdefinierte Kopfzeileneinstellungen"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr " Löschen "
 
@@ -5349,197 +5362,197 @@ msgstr "Schreibe Konfiguration zum Anzeigen der Kopfzeilen...\n"
 msgid "This header is already in the list."
 msgstr "Diese Kopfzeile ist bereits in der Liste enthalten."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Filtereinstellungen"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr "An"
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Wollen Sie wirklich die Regel '%s' löschen?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Lösche Regel"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 msgid "Filter rule"
 msgstr "Filterregel"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr "Wenn eine der folgenden Bedingungen zutrifft"
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr "Wenn alle der folgenden Bedingungen zutriffen"
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr "Die folgenden Aktionen ausführen:"
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr "An oder Cc"
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 msgid "Any header"
 msgstr "Jede Kopfzeile"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 msgid "Edit header..."
 msgstr "Kopfzeile bearbeiten..."
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 msgid "Message body"
 msgstr "Nachrichtenkörper"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr "Ergebnis des Befehls"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr "Alter"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "enthalten"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 msgid "doesn't contain"
 msgstr "nicht enthalten"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr "ist"
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr "ist nicht"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr "entspricht Regex"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr "entspricht nicht Regex"
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr "ist größer als"
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr "ist kleiner als"
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr "ist länger als"
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr "ist kürzer als"
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 msgid "Move to"
 msgstr "Verschiebe nach"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 msgid "Copy to"
 msgstr "Kopiere nach"
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Nicht empfangen"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 msgid "Delete from server"
 msgstr "Vom Server löschen"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 msgid "Set mark"
 msgstr "Setze Markierung"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 msgid "Set color"
 msgstr "Setze Farbe"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 msgid "Mark as read"
 msgstr "Als gelesen markieren"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 msgid "Forward as attachment"
 msgstr "Weiterleiten als Anhang"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 msgid "Redirect"
 msgstr "Umadressieren"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 msgid "Execute command"
 msgstr "Befehl ausführen"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr "Beende Regelauswertung"
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 msgid "folder:"
 msgstr "Ablage:"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 msgid "day(s)"
 msgstr "Tag(en)"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 msgid "address:"
 msgstr "Adresse:"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 msgid "Edit header list"
 msgstr "Kopfzeile bearbeiten..."
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 msgid "Headers"
 msgstr "Kopfzeilen"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 msgid "Header:"
 msgstr "Kopfzeilen:"
 
-#: src/prefs_filter_edit.c:1679
-msgid "Rule name is not specified."
-msgstr "Regelname wurde nicht angegeben."
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 msgid "Command is not specified."
 msgstr "Befehl wurde nicht gesetzt."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr "Es existiert eine ungültige Bedingung."
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 msgid "Destination folder is not specified."
 msgstr "Zielablage wurde nicht angegeben."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+msgid "Rule name is not specified."
+msgstr "Regelname wurde nicht angegeben."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr "Es existiert eine ungültige Bedingung."
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr "Es existiert eine ungültige Aktion."
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 msgid "Condition not exist."
 msgstr "Die Bedingung existiert nicht."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 msgid "Action not exist."
 msgstr "Die Aktion existiert nicht."
 
@@ -5999,15 +6012,20 @@ msgstr "nur lesen"
 msgid "unknown"
 msgstr "unbekannt"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "Kann die Newsgroup-Liste nicht empfangen."
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Kann die Newsgroup-Liste nicht empfangen."
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Fertig."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d Newsgruppe(n) empfangen (%s gelesen)"
diff --git a/po/el.po b/po/el.po
index 72fcdee9..3bccd133 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+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,9 +18,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Διαβάζω τις ρυθμίσεις για κάθε λογαριασμό...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "απέτυχα να γράψω τις ρυθμίσεις στο αρχείο\n"
@@ -44,183 +44,183 @@ msgstr "δημιουργία IMAP4 σύνδεσης στο %s:%d ...\n"
 msgid "Can't start TLS session.\n"
 msgstr ""
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Διαγράφω το μήνυμα"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Στέλνω το μήνυμα (%d / %d bytes)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Μετακινώ το μήνυμα  %s%c%d στο %s ...\n"
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Αντιγράφω το μήνυμα %s%c%d στο %s ...\n"
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Λαμβάνω τα μηνύματα από το %s στο %s...\n"
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "δεν μπορώ να τα σημειώσω ως διεγραμμένα: %d\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "δεν μπορώ να τα απαλείψω\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Λαμβάνω τα μηνύματα από το %s στο %s...\n"
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "δεν μπορώ να τα σημειώσω ως διεγραμμένα: 1:%d\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "δεν μπορώ να επιλέξω τον κατάλογο: %s\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Το αρχείο σημάνσεων δεν βρέθηκε.\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "συνέβη σφάλμα καθώς λάμβανα LIST.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, fuzzy, c-format
 msgid "Can't create '%s'\n"
 msgstr "δεν μπορώ να δημιουργήσω %s\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, fuzzy, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "δεν μπορώ να δημιουργήσω %s\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "δεν μπορώ να δημιουργήσω το mailbox: η LIST απέτυχε\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "δεν μπορώ να δημιουργήσω το mailbox\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, fuzzy, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "δεν μπορώ να δημιουργήσω το mailbox\n"
 
-#: libsylph/imap.c:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "δεν μπορώ να διαγράψω το mailbox\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "δεν μπορώ να λάβω τον φάκελο\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Στέλνω το μήνυμα (%d / %d bytes)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "συνέβη σφάλμα καθώς λάμβανα τον φάκελο.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "δεν μπορώ να διαβάσω τον φάκελο: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Δεν μπορώ να συνδεθώ στον IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2475
+#: libsylph/imap.c:2487
 #, fuzzy, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Δεν μπορώ να συνδεθώ στον IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr ""
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "δεν μπορώ να επιλέξω τον κατάλογο: %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "σφάλμα κατά την εντολή imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Πιστοποίηση"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "Η είσοδος στο IMAP4 απέτυχε.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "δεν μπορώ να προσθέσω το %s στο %s\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 #, fuzzy
 msgid "(sending file...)"
 msgstr "Στέλνω DATA..."
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "δεν μπορώ να προσθέσω το μήνυμα %s\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "δεν μπορώ να αντιγράψω το %d στο %s\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "σφάλμα κατά την εντολή imap: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "σφάλμα κατά την εντολή imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "σφάλμα κατά την εντολή imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr ""
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
@@ -305,30 +305,30 @@ msgstr "δεν μπορώ να μηδενίσω το mailbox.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Εξαγωγή μηνυμάτων από %s προς %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "δεν μπορώ να αντιγράψω το μήνυμα %s στο %s\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "Δεν μπορώ να ανοίξω σημειωμένο αρχείο.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "ο πηγαίος κατάλογος είναι ίδιος με τον κατάλογο προορισμού.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Αντιγράφω το μήνυμα %s%c%d στο %s ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Τελευταίος αριθμός στον κατάλογο %s = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -337,7 +337,7 @@ msgstr ""
 "Το αρχείο `%s' υπάρχει ήδη.\n"
 "Δεν μπορώ να δημιουργήσω τον κατάλογο."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -359,71 +359,71 @@ msgstr "δημιουργώ NNTP σύνδεση στο %s:%d ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "Η NNTP σύνδεση στο %s:%d διακόπηκε. Επανασύνδεση...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "το άρθρο %d έχει προσπελαστεί ήδη.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "λαμβάνω το άρθρο %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "δεν μπορώ να διαβάσω το άρθρο %d\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "δεν μπορώ να λάβω την λίστα newsgroup\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "δεν μπορώ να στείλω το άρθρο.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "δεν μπορώ να λάβω το άρθρο %d\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "δεν μπορώ να επιλέξω την ομάδα %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "μη έγκυρη ακολουθία άρθρων: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "δεν υπάρχουν νέα άρθρα.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "λαμβάνω xover %d - %d στο %s...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "δεν μπορώ να λάβω xover\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "συνέβη σφάλμα καθώς λάμβανα xover.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "μη έγκυρη γραμμή xover: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "δεν μπορώ να λάβω xhdr\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "συνέβη σφάλμα καθώς λάμβανα xhdr.\n"
 
@@ -524,16 +524,16 @@ msgstr "Κατάλογος"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "Η μετατροπή του κώδικα απέτυχε.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "δεν μπορώ να ανοίξω το αρχείο mark\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "δεν μπορώ να λάβω το μήνυμα %d\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Η εντολή εκτύπωσης είναι άκυρη: `%s'\n"
@@ -726,12 +726,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Όνομα"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Πρωτόκολλο"
 
@@ -739,7 +739,7 @@ msgstr "Πρωτόκολλο"
 msgid "Server"
 msgstr "Εξυπηρέτης"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Επεξεργασία"
 
@@ -753,7 +753,7 @@ msgstr " Θέσε ως σύνηθη λογαριασμό "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Θέλετε πράγματι να διαγράψετε αυτό το λογαριασμό;"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Χωρίς τίτλο"
@@ -1004,7 +1004,7 @@ msgstr "Διεύθυνση e-mail"
 msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Όνομα:"
 
@@ -1019,7 +1019,7 @@ msgstr "Διαγραφή"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Προσθήκη"
 
@@ -1186,7 +1186,7 @@ msgid "Group"
 msgstr "ΝέαΟμάδα"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Κατάλογος"
 
@@ -1752,12 +1752,12 @@ msgid "MIME type"
 msgstr "τύπος MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Αποστολή"
@@ -1801,7 +1801,7 @@ msgid "Attach file"
 msgstr "Προσάρτηση αρχείου"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Yπογραφή"
@@ -2020,7 +2020,7 @@ msgid " Check File "
 msgstr " Έλεγχος Αρχείου "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Αρχείο"
 
@@ -2100,7 +2100,7 @@ msgid "Edit JPilot Entry"
 msgstr "Επεξεργασία εγγραφής JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2166,7 +2166,7 @@ msgstr ""
 msgid "Maximum Entries"
 msgstr "Μέγιστος αριθμός εγγραφών"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Βασικά"
 
@@ -2227,7 +2227,7 @@ msgid "Exporting file:"
 msgstr "Εξαγωγή αρχείου:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr "Επιλογή... "
 
@@ -3812,7 +3812,7 @@ msgstr "Λήψη νέου mail από όλους τους λογαριασμού
 msgid "Send queued message(s)"
 msgstr "Αποστολή όλων των μηνυμάτων από την ουρά"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Σύνθεση"
@@ -3839,7 +3839,7 @@ msgstr ""
 msgid "Reply to all"
 msgstr "Απάντηση σε όλους"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Προώθηση"
 
@@ -4127,412 +4127,425 @@ msgstr ""
 "Λάθος κωδική φράση! Ξαναπροσπαθήστε...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Ανοίγω το παράθυρο επιλογών των λογαριασμών...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Λογαριασμός%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Επιλογές για το νέο λογαριασμό"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 #, fuzzy
 msgid "Account preferences"
 msgstr "Κοινές Επιλογές"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Δημιουργώ το παράθυρο επιλογών του λογαριασμού...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Λήψη"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Μυστικότητα"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Προχωρημένα"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Όνομα του λογαριασμού"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 #, fuzzy
 msgid "Set as default"
 msgstr " Θέσε ως σύνηθη λογαριασμό "
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Προσωπικές πληροφορίες"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Πλήρες όνομα"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "Διεύθυνση mail"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Οργανισμός"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Πληροφορίες εξυπηρέτη"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "Νέα (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Τίποτα (τοπικό)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Αυτός ο εξυπηρέτης απαιτεί πιστοποίηση"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "Εξυπηρέτης νέων"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Εξυπηρέτης για λήψη"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "Εξυπηρέτης SMTP (αποστολή)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "Όνομα χρήστη"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Κωδικός"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Αυτός ο εξυπηρέτης απαιτεί πιστοποίηση"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Διαγραφή μηνυμάτων από τον εξυπηρέτη όταν παραληφθούν"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 #, fuzzy
 msgid "Remove after"
 msgstr "Αφαίρεση καταλόγου"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 #, fuzzy
 msgid "days"
 msgstr "Πάντα"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr ""
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Λήψη όλων των μηνυμάτων από τον εξυπηρέτη"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 #, fuzzy
 msgid "Receive size limit"
 msgstr "Εμφάνιση διαλόγου λήψης"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Φιλτράρισμα μηνυμάτων κατά την λήψη"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 #, fuzzy
 msgid "Default inbox"
 msgstr "Προκαθορισμένο κλειδί υπογραφής"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr ""
 "Άνοιγμα του πρώτου αδιάβαστου μηνύματος κατά τη μετακίνηση σε ένα κατάλογο"
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 #, fuzzy
 msgid "Authentication method"
 msgstr "Πιστοποίηση"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Αυτόματη"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "Νέα"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Μέγιστος αριθμός άρθρων που θα ληφθούν\n"
 "(χωρίς όριο αν θέσετε 0)"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Ο παραλήπτης δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 #, fuzzy
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Λήψη όλων' ελέγχει για νέα μηνύματα σε αυτό το λογαριασμό"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Επικεφαλίδα"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Προσθήκη πεδίου ημερομηνίας στην κεφαλίδα"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Δημιουργία Message-ID"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Προσθήκη κεφαλίδας ορισμένης από τον χρήστη"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr "Επεξεργασία..."
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Πιστοποίηση"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Πιστοποίηση SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Πιστοποίηση με POP3 πριν την αποστολή"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 #, fuzzy
 msgid "Command output"
 msgstr "Εντολή"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 #, fuzzy
 msgid "Automatically set the following addresses"
 msgstr "Αυτόματος ορισμός αυτών των διευθύνσεων"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Κοινοποίηση"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Απάντηση σε"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Υπογραφή μηνυμάτων εξ ορισμού"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "Κρυπτογράφηση μηνυμάτων εξ ορισμού"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 #, fuzzy
 msgid "Use clear text signature"
 msgstr "Εισαγωγή υπογραφής"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Κλειδί υπογραφής"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Χήση προκαθορισμένου κλειδιού GnuPG"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Επιλογή κλειδιού με βάση την email διεύθυνση"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Ορίστε με το χέρι το κλειδί"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "Χρήστης ή key ID:"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "Να μην χρησιμοποιείται SSL"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "Χρήση SSL για σύνδεση POP3"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Χρήση εντολής STARTTLS για την έναρξη ασφαλούς (SSL) συνόδου"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "Χρήση SSL για σύνδεση IMAP4"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 #, fuzzy
 msgid "Use SSL for NNTP connection"
 msgstr "Χρήση SSL για σύνδεση SMTP"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Αποστολή (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "Χρήση SSL για σύνδεση SMTP"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "Προσδιορισμός θύρας SMTP"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "Προσδιορισμός θύρας POP3"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "Προσδιορισμός θύρας IMAP4"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "Προσδιορισμός θύρας NNTP"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Ορισμός του ονόματος του domain"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "Κατάλογος στον εξυπηρέτη IMAP4"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 #, fuzzy
 msgid "Put sent messages in"
 msgstr "Αποθήκευση σταλμένων μηνυμάτων στο outbox"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 #, fuzzy
 msgid "Put draft messages in"
 msgstr "Τύλιξη μηνυμάτων στους"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Διαγραφή μηνύματος"
+
+#: src/prefs_account_dialog.c:1723
 #, fuzzy
 msgid "Put deleted messages in"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 #, fuzzy
 msgid "Account name is not entered."
 msgstr "Η διεύθυνση mail δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "Η διεύθυνση mail δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "Ο εξυπηρέτης SMTP δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "Το όνομα χρήστη δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "Ο εξυπηρέτης POP3 δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "Ο εξυπηρέτης IMAP4 δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "Ο εξυπηρέτης NNTP δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5526,7 +5539,7 @@ msgstr ""
 msgid "Custom header setting"
 msgstr "Ρυθμίσεις ειδικής κεφαλίδας"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr " Διαγραφή"
 
@@ -5582,221 +5595,221 @@ msgstr "Γράφω τις ρυθμίσεις για εμφάνιση κεφαλ�
 msgid "This header is already in the list."
 msgstr "Αυτή η κεφαλίδα είναι ήδη στη λίστα."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Ρυθμίσεις φίλτρων"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτός ο κανόνας;"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Διαγραφή κανόνα"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 #, fuzzy
 msgid "Filter rule"
 msgstr "Διαγραφή κανόνα"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 #, fuzzy
 msgid "Any header"
 msgstr "Όλες οι κεφαλίδες"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 #, fuzzy
 msgid "Edit header..."
 msgstr "Επικεφαλίδα"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 #, fuzzy
 msgid "Message body"
 msgstr "Μήνυμα"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "περιέχει"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 #, fuzzy
 msgid "doesn't contain"
 msgstr "δεν περιέχει"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 #, fuzzy
 msgid "Move to"
 msgstr "Μετακίνηση Κάτω"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 #, fuzzy
 msgid "Copy to"
 msgstr "/Αντιγραφή..."
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Μην παραλάβεις"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 #, fuzzy
 msgid "Delete from server"
 msgstr "Διαγραφή news server"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 #, fuzzy
 msgid "Set mark"
 msgstr "Σχόλια"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 #, fuzzy
 msgid "Set color"
 msgstr "Όρισμος χρωμάτων μηνύματος"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 #, fuzzy
 msgid "Mark as read"
 msgstr "/Σήμανση/Σήμανση ως διαβασμένο"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/Προώθηση ως προσάρτηση"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 #, fuzzy
 msgid "Redirect"
 msgstr "/Επαν-επεξεργασία"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 #, fuzzy
 msgid "Execute command"
 msgstr "Εκτέλεση"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 #, fuzzy
 msgid "folder:"
 msgstr "Κατάλογος"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 #, fuzzy
 msgid "day(s)"
 msgstr "Πάντα"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 #, fuzzy
 msgid "address:"
 msgstr "Διεύθυνση"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 #, fuzzy
 msgid "Edit header list"
 msgstr "Επικεφαλίδα"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 #, fuzzy
 msgid "Headers"
 msgstr "Επικεφαλίδα"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 #, fuzzy
 msgid "Header:"
 msgstr "Επικεφαλίδα"
 
-#: src/prefs_filter_edit.c:1679
-#, fuzzy
-msgid "Rule name is not specified."
-msgstr "Ο παραλήπτης δεν έχει οριστεί."
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Το όνομα της κεφαλίδας δεν έχει οριστεί."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Ο προορισμός δεν έχει οριστεί."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+#, fuzzy
+msgid "Rule name is not specified."
+msgstr "Ο παραλήπτης δεν έχει οριστεί."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Το όνομα της κεφαλίδας δεν έχει οριστεί."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: το αρχείο δεν υπάρχει\n"
@@ -6262,15 +6275,20 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "δεν μπορώ να πάρω την λίστα των newsgroup"
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "δεν μπορώ να πάρω την λίστα των newsgroup"
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Τέλος"
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d newsgroups λήφθηκαν (%s διαβασμένα)"
diff --git a/po/es.po b/po/es.po
index 7f7643e1..49e63223 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+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,9 +18,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Leyendo configuración de cada cuenta...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "fallo escribiendo la configuración a fichero\n"
@@ -43,177 +43,177 @@ msgstr "creando conexión IMAP4 con %s:%d ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "No puedo iniciar la sesión TLS.\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Borrando mensaje %d"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Enviando mensaje (%d / %d bytes)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Copiando mensaje %s%c%d a %s ...\n"
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiando mensaje %s%c%d a %s ...\n"
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Obteniendo mensajes desde %s..."
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "no puedo establecer los flags borrados: %s\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "no puedo vaciar\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Obteniendo mensajes desde %s..."
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 msgid "can't set deleted flags: 1:*\n"
 msgstr "no puedo establecer los flags borrados: 1:*\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 msgid "can't close folder\n"
 msgstr "no se puede cerrar la carpeta\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "la carpeta raíz %s no existe\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 msgid "error occurred while getting LIST.\n"
 msgstr "hubo un error obteniendo LIST.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "No puedo crear '%s'\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "No puedo crear '%s' bajo Entrada\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no puedo crear el buzón: LIST falló\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "no puedo crear el buzón\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, 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:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "no puedo borrar el buzón\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "no se puede obtener la estructura del mensaje\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Enviando mensaje (%d / %d bytes)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "Error obteniendo la estructura del mensaje.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "No se puede interpretar la estructura del mensaje: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, 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:2475
+#: libsylph/imap.c:2487
 #, 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:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "no se puede obtener el espacio de nombres\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "no se puede seleccionar la carpeta: %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "error en el mandato imap: CLOSE\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 msgid "IMAP4 authentication failed.\n"
 msgstr "La autentificación IMAP falló.\n"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificación IMAP4 fallida.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "no puedo añadir %s a %s\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(enviando fichero...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "no se puede añadir el mensaje a %s\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "no puedo copiar %s a %s\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "error en el mandato imap: STORE %s %s\n"
 
-#: libsylph/imap.c:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "error en el mandato imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 msgid "error while imap command: CLOSE\n"
 msgstr "error en el mandato imap: CLOSE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv no puede convertir UTF-7 a %s\n"
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv no puede convertir %s a UTF-7\n"
@@ -300,30 +300,30 @@ msgstr "no se puede truncar a cero el buzón.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportando mensajes de %s a %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "no se puede copiar mensaje %s a %s\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "No se puede abrir el fichero de marcas.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "carpetas de origen y destino idénticas.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copiando mensaje %s%c%d a %s ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Último número en directorio %s = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -332,7 +332,7 @@ msgstr ""
 "El fichero «%s» ya existe.\n"
 "No puedo crear la carpeta."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -361,71 +361,71 @@ msgstr "creando conexión NNTP con %s:%d ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "La conexión NNTP con %s:%d ha sido rota. Reconectando...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "el artículo %d ya esta en caché.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "obteniendo artículo %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "no puedo leer el artículo %d\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "no puedo obtener la lista de grupos\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "no se puede enviar el artículo.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "no puedo obtener el artículo %d\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "no puedo seleccionar grupo: %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "rango de artículos no válido: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "no hay artículos nuevos.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obteniendo xover %d - %d en %s...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "no se puede obtener xover\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "hubo un error obteniendo xover.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "linea xover no válida: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "no se puede obtener xhdr\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "hubo un error obteniendo xhdr.\n"
 
@@ -519,16 +519,16 @@ msgstr "Filtro de correo basura"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Conversión de códigos fallida.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "no se puede abrir el fichero de marcas\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "no se puede obtener el mensaje %d\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La orden para imprimir es inválida: «%s»\n"
@@ -718,12 +718,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Nombre"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -731,7 +731,7 @@ msgstr "Protocolo"
 msgid "Server"
 msgstr "Servidor"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Editar"
 
@@ -744,7 +744,7 @@ msgstr "_Establecer como cuenta primaria "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "¿Esta seguro de que quiere borrar la cuenta «%s»?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 msgid "(Untitled)"
 msgstr "(Sin título)"
 
@@ -995,7 +995,7 @@ msgstr "Dirección e-mail"
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -1010,7 +1010,7 @@ msgstr "Borrar"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Añadir"
 
@@ -1182,7 +1182,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -1704,12 +1704,12 @@ msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Enviar"
@@ -1751,7 +1751,7 @@ msgid "Attach file"
 msgstr "Adjuntar fichero"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Firma"
@@ -1959,7 +1959,7 @@ msgid " Check File "
 msgstr " Comprobar fichero "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Fichero"
 
@@ -2037,7 +2037,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2102,7 +2102,7 @@ msgstr "Tiempo límite (seg.)"
 msgid "Maximum Entries"
 msgstr "Nº entradas máximas"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Básico"
 
@@ -2160,7 +2160,7 @@ msgid "Exporting file:"
 msgstr "Fichero de exportación:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr "Seleccionar..."
 
@@ -3623,7 +3623,7 @@ msgstr "Incorporar correo nuevo de todas las cuentas"
 msgid "Send queued message(s)"
 msgstr "Enviar mensaje(s) en la cola"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Componer"
@@ -3648,7 +3648,7 @@ msgstr "A todos"
 msgid "Reply to all"
 msgstr "Responder a todos"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Reenviar"
 
@@ -3926,213 +3926,213 @@ msgstr ""
 "¡Contraseña errónea! Intentelo de nuevo...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Abriendo ventana de preferencias de cuenta...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Cuenta%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Preferencias para una nueva cuenta"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Preferencias de la cuenta"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Creando ventana de preferencias de cuenta...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Avanzadas"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Nombre de esta cuenta"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "Cuenta por defecto"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Información personal"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Nombre completo"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "Dirección de correo"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Organización"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Información del servidor"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "Noticias (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Ninguna (local)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Este servidor requiere autentificación"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "Servidor de news"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Servidor de recepción"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "Usuario"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Contraseña"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 msgid "Use secure authentication (APOP)"
 msgstr "Usar autentificación segura (APOP)"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Eliminar los mensajes del servidor al recibir"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "Eliminar después de"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "días"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 días: eliminar inmediatamente)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Descargar todos los mensajes del servidor"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "Tamaño límite para recibir"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr "Kb"
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensajes al recibir"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Buzón por defecto"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Los mensajes sin filtrar se guardarán en esta carpeta."
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "Método de autentificación"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Automática"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "Noticias"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artículos a descargar"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 msgid "No limit if 0 is specified."
 msgstr "Sin límite si se especifica 0."
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Traer todo' comprueba si hay mensajes nuevos en esta cuenta"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Cabecera"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Añadir campo Fecha"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Generar ID-Mensaje"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Añadir cabecera de usuario"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " Editar... "
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Autentificación"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentificación SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4140,177 +4140,190 @@ msgstr ""
 "Si deja estos campos vacíos, se utilizará el mismo ID de usuario y "
 "contraseña usados para la recepción."
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentificación con POP3 antes de enviar"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 msgid "Command output"
 msgstr "Salida de la orden"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Establecer las siguientes direcciones automáticamente"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Firmar el mensaje por defecto"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "Encriptar el mensaje por defecto"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr "Encriptar al responder a un mensaje cifrado"
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "Usar formato ASCII blindado para encriptación"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "Usar firma de texto claro"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Firmar clave"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Usar clave GnuPG por defecto"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Seleccionar clave por dirección de correo"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Especificar clave manualmente"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "Usuario o ID clave:"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "No usar SSL"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "Usar SSL para la conexión POP3"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usar el mandato STARTTLS para abrir la sesión SSL"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usar SSL para la conexión IMAP4"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para la conexión NNTP"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "Usar SSL para la conexión SMTP"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr "Utilizar SSL no bloqueante"
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Deshabilítelo si tiene problemas con la conexión SSL."
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "Puerto SMTP"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "Puerto POP3"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "Puerto IMAP4"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "Puerto NNTP"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Nombre del dominio"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "Directorio del servidor IMAP4"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "Poner mensajes enviados en"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "Poner borradores de mensajes en"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Poner mensajes borrados en"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "Poner mensajes borrados en"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "No se especificó el nombre de cuenta."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "No se especificó la dirección de correo."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "No se especificó el servidor SMTP."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "No se especificó el usuario."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "No se especificó el servidor POP3."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "No se especificó el servidor IMAP4."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "No se especificó el servidor NNTP."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5294,7 +5307,7 @@ msgstr "Antiguos de Sylpheed"
 msgid "Custom header setting"
 msgstr "Configuración de cabeceras de usuario"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr " Borrar "
 
@@ -5350,197 +5363,197 @@ msgstr "Escribiendo configuración para mostrar cabeceras...\n"
 msgid "This header is already in the list."
 msgstr "Esa cabecera ya existe en la lista."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Preferencias de filtrado"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "¿Está seguro de que quiere borrar la regla «%s»?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Borrar regla"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 msgid "Filter rule"
 msgstr "Regla de filtrado"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr "Si coincide alguna de las condiciones siguientes"
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr "Si coinciden todas las condiciones siguientes"
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr "Realizar las acciones siguientes:"
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr "Para o Cc"
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 msgid "Any header"
 msgstr "Cualquier cabecera"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 msgid "Edit header..."
 msgstr "Editar cabecera..."
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 msgid "Message body"
 msgstr "Cuerpo del mensaje"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr "Resultado de una orden"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr "Edad"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "contiene"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 msgid "doesn't contain"
 msgstr "no contiene"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr "es"
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr "no es"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr "coincide con exp.reg."
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr "no coincide con exp.reg."
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr "es mayor que"
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr "es menor que"
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr "es más largo que"
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr "es más corto que"
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 msgid "Move to"
 msgstr "Mover a"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 msgid "Copy to"
 msgstr "Copiar a"
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "No recibir"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 msgid "Delete from server"
 msgstr "Borrar del servidor"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 msgid "Set mark"
 msgstr "Establecer marca"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 msgid "Set color"
 msgstr "Establecer color"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 msgid "Mark as read"
 msgstr "Marcar como leído"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 msgid "Forward as attachment"
 msgstr "Reenviar como adjunto"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 msgid "Redirect"
 msgstr "Redirigir"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 msgid "Execute command"
 msgstr "Ejecutar orden"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr "Detener la evaluación de reglas"
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 msgid "folder:"
 msgstr "carpeta:"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 msgid "day(s)"
 msgstr "día(s)"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 msgid "address:"
 msgstr "dirección:"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 msgid "Edit header list"
 msgstr "Editar lista de cabeceras"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 msgid "Headers"
 msgstr "Cabeceras"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 msgid "Header:"
 msgstr "Cabecera:"
 
-#: src/prefs_filter_edit.c:1679
-msgid "Rule name is not specified."
-msgstr "No se especificó el nombre de la regla."
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 msgid "Command is not specified."
 msgstr "No se especificó la orden."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr "Existe una condición inválida."
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 msgid "Destination folder is not specified."
 msgstr "No se especificó la carpeta de destino."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+msgid "Rule name is not specified."
+msgstr "No se especificó el nombre de la regla."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr "Existe una condición inválida."
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr "Existe una orden inválida."
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 msgid "Condition not exist."
 msgstr "No existe la condición."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 msgid "Action not exist."
 msgstr "No existe la acción."
 
@@ -5987,15 +6000,20 @@ msgstr "solo lectura"
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "No se puede obtener la lista de grupos."
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "No se puede obtener la lista de grupos."
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Hecho."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d grupos de noticias recibidos (%s leídos)"
diff --git a/po/et.po b/po/et.po
index 6eaf6b89..67a97424 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+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,9 +18,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Loen kõigi kontode seaded...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "Häälestuse salvestamine ebaõnnestus\n"
@@ -44,182 +44,182 @@ msgstr "loon IMAP4 ühendust %s:%d-ga ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "Ei suuda avada TLS sessiooni.\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Kustutan kirja %d"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Saadan kirja (%d / %d baiti)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Liigutan kirja %s%c%d kausta %s ...\n"
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopeerin kirja %s%c%d kausta %s ...\n"
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ei suutnud seada kustutatu lippu: %d\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "ei suuda väljastada\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ei suutnud seada kustutatu lippu: 1:%d\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ei suuuda valida kausta: %s\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "*Märgi faili ei leidunud.\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "Nimistu saamisel tekkis viga.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Ei suuda luua '%s'\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Ei suuda luua '%s' Sisendkasti all\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ei suuda luua kirjakasti: Nimistu ebaõnnestus\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "ei suuda luua kirjakasti\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, 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:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "ei suuda kustutada kirjakasti\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "ei suuda võtta ümbrikut\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Saadan kirja (%d / %d baiti)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "ümbriku võtmisel tekis viga.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ei suutnud avada ümbrikut: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ei suuda ühendada IMAP4 serveriga: %s:%d\n"
 
-#: libsylph/imap.c:2475
+#: libsylph/imap.c:2487
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ei suuda ühendada IMAP4 serveriga: %s:%d\n"
 
-#: libsylph/imap.c:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "ei suutnud leida nime asukohta\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ei suuuda valida kausta: %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autoriseerimise meetod"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 sissekirjutus ebaõnnestus.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ei suuda %s-d lisada %s-i\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(saadan faili...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ei suuda lisada kirja %s\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ei suuda %d-d kopeerida %s-i\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, 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:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, 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:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ei suuda konverteerida %s-i UTF-7-ks\n"
@@ -306,30 +306,30 @@ msgstr "kirjakasti ei saa lõigata nulliks.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Ekspordime teated %s-ist %s-i ...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ei saa kirja kopeerida %s-st %s-i\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "Ei suutnud avada märgi faili.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "lähtekaust on identne sihtkaustale.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopeerin kirja %s%c%d kausta %s ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Viimane number kataloogis %s on %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -338,7 +338,7 @@ msgstr ""
 "Fail %s on juba olemas.\n"
 "Ei saa kausta luua."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -360,71 +360,71 @@ msgstr "loon NNTP ühendust %s:%d-ga ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP ühendus %s:%d-ga on katkestatud. Taasühendan...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "artikkel %d on juba hoidlas.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "võtan artikli %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "ei saanud artiklit %d\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "ei saanud uudistegrupi nimekirja\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "ei saanud saata artiklit.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "ei saanud artiklit %d kohale\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "ei saa valida gruppi %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ebasobiv artiklite vahemik: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "uusi artikelid pole.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "*võtan xover-i %d - %d %s-is\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "*ei saa xover'it\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "*xover'i võtmisel tekkis viga\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "*vigane xover rida: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "*ei saa xhdr-i\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "xhdr-i võtmise käigus tekkis viga.\n"
 
@@ -522,16 +522,16 @@ msgstr "Kaust"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Koodi muundamine ebaõnnestus.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "Ei suuda avada märgifaili\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ei suuda võtta kirja %d\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Trükkimise käsurida on vale: %s\n"
@@ -720,12 +720,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Nimi"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -733,7 +733,7 @@ msgstr "Protokoll"
 msgid "Server"
 msgstr "Server"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Redigeeri"
 
@@ -747,7 +747,7 @@ msgstr " Määra vaikimisi kontoks "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Kas te tõesti soovite kustutada kontot?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Tiitlita"
@@ -997,7 +997,7 @@ msgstr "E-Posti aadress"
 msgid "Address book"
 msgstr "Aadressiraamat"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -1012,7 +1012,7 @@ msgstr "Kustuta"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Lisa"
 
@@ -1185,7 +1185,7 @@ msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Kaust"
 
@@ -1739,12 +1739,12 @@ msgid "MIME type"
 msgstr "MIME tüüp"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Saada"
@@ -1786,7 +1786,7 @@ msgid "Attach file"
 msgstr "Manusta fail"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Allkiri"
@@ -2000,7 +2000,7 @@ msgid " Check File "
 msgstr " Kontrolli faili "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Fail"
 
@@ -2078,7 +2078,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redigeeri JPilot sissekannet"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2143,7 +2143,7 @@ msgstr "Ajalimiit (sek)"
 msgid "Maximum Entries"
 msgstr "Sissekannete piirarv"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Baas"
 
@@ -2200,7 +2200,7 @@ msgid "Exporting file:"
 msgstr "Väljastatav fail:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr " Vali... "
 
@@ -3689,7 +3689,7 @@ msgstr "Võta kõigilt kontodelt uued kirjad"
 msgid "Send queued message(s)"
 msgstr "Saada kirjad järjekorrast"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Kirjuta"
@@ -3714,7 +3714,7 @@ msgstr "Vasta ja"
 msgid "Reply to all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Edasta"
 
@@ -3996,219 +3996,219 @@ msgstr ""
 "Vale parool! Proovi uuesti...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Avan konto parameetrite akent...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Uue konto omadused"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Konto omadused"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Loon konto omaduste akent...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Saabuvad kirjad"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Privaatsus"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Spetsiaalne"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Selle konto nimi"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr " Määra vaikimisi kontoks "
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Isiku informatsioon"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Täisnimi"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "E-Posti aadress"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Ofganisatsioon"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Serveri informatsioon"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "Uudised (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Lokaalarvutist"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "See servar nõuab autoriseerimist"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "Uudiste server"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Sissetulevate kirjade server"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "Saatmise server (SMTP)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "Kasutajanimi"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Parool"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "See servar nõuab autoriseerimist"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Kustuta kirjad pärast kohalejõudmist serverist"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "Eemalda pärast"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "päeva"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 päeva: eemalda kohe)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Võta serverist kõik kirjad"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "Tõmbamise suuruse limiit"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Filtreeri saabuvaid kirju"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Vaikimisi sisendkast"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Filtreerimata kirjad salvestatakse sellesse kausta)"
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "Autoriseerimise meetod"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "Uudised"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maksimaalne võetavate artiklite arv\n"
 "(määramata kui sisestate 0)"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Saaja pole määratud."
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "Kui vajutate nuppu 'Võta kõik', siis uusi kirju võetakse ka siia"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Päis"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Lisa kuupäev päisesse"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Loo Kirja-ID"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Lisa kasutaja defineeritud päis"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " Redigeeri... "
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Autoriseerimine"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Autoriseerimine (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4217,178 +4217,191 @@ msgstr ""
 "Kui te jätate need sissekanded tühjaks, siis \n"
 "kasutatakse vastuvõtva kasutaja ID-d ja parooli."
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Autoriseeri POP3 enne saatmist"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 #, fuzzy
 msgid "Command output"
 msgstr "Käsklus"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Säti järgmised aadressid automaatselt"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Vastus saata"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Vaikimisi tuleb kiri allkirjastada"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "Vaikimisi tuleb kiri krüpteerida"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "Kasuta ASCII-ga varustatud krüpteerimise formaati"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "Kasuta seleget teksti allkirja"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Allkirja võti"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Kasuta algset GnuPG võtit"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Vali võti elektronposti aadressi juurest"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Määra võti käsitsi"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "Kasutaja või võtme ID:"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "Ära kasuta SSL"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "Kasuta SSL-i POP3-e ühenduse jaoks"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Kasuta STARTTLS käsklust et alustada SSL sessiooni"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "Kasuta SSL-i IMAP4-ja ühenduse jaoks"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "Kasuta SSL-i NNTP ühenduse loomisel"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Saada (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "Kasuta SSL-i SMTP ühenduse jaoks"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "Määra SMTP port"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "Määra POP3 port"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "Määra IMAP4 port"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "Määra NNTP port"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Määra domeeni nimi"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "IMAP serveri kataloog"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "Pane saadetud kirjad"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "Pane mustandi kirjad"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Pane kustutatud kirjad"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "Pane kustutatud kirjad"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "Konto nime ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "Postiaadressi ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "SMTP serverit ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "Kasutajanime ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "POP3 serverit ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 serverit ei ole sisestatud"
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "NNTP serverit ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5389,7 +5402,7 @@ msgstr "Vana Sylpheed"
 msgid "Custom header setting"
 msgstr "Enda määratud päise häälestus"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr " Kustuta "
 
@@ -5445,221 +5458,221 @@ msgstr "Kirjutan päise näitamise häälestuse...\n"
 msgid "This header is already in the list."
 msgstr "See päis juba on nimekirjas."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Filtri sättimine"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Kas te tõesti soovite seda reeglit kustutada?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Kustuta reegel"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 #, fuzzy
 msgid "Filter rule"
 msgstr "Kustuta reegel"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 #, fuzzy
 msgid "Any header"
 msgstr "Kogu päis"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 #, fuzzy
 msgid "Edit header..."
 msgstr "Päis"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 #, fuzzy
 msgid "Message body"
 msgstr "Kiri"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "sisaldab"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 #, fuzzy
 msgid "doesn't contain"
 msgstr "ei sisalda"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 #, fuzzy
 msgid "Move to"
 msgstr "Liiguta alla"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 #, fuzzy
 msgid "Copy to"
 msgstr "/Kopeeri..."
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Ära võta vastu"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 #, fuzzy
 msgid "Delete from server"
 msgstr "Kustuta kaust"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 #, fuzzy
 msgid "Set mark"
 msgstr "Märkused"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 #, fuzzy
 msgid "Set color"
 msgstr "Säti kirja värvid"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 #, fuzzy
 msgid "Mark as read"
 msgstr "/Märk/Märgi loetuks"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/Saada edasi manusena"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 #, fuzzy
 msgid "Redirect"
 msgstr "/Suuna ümber"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 #, fuzzy
 msgid "Execute command"
 msgstr "Käivita"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 #, fuzzy
 msgid "folder:"
 msgstr "Kaust"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 #, fuzzy
 msgid "day(s)"
 msgstr "päeva"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 #, fuzzy
 msgid "address:"
 msgstr "Aadress"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 #, fuzzy
 msgid "Edit header list"
 msgstr "Päis"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 #, fuzzy
 msgid "Headers"
 msgstr "Päis"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 #, fuzzy
 msgid "Header:"
 msgstr "Päis"
 
-#: src/prefs_filter_edit.c:1679
-#, fuzzy
-msgid "Rule name is not specified."
-msgstr "Saaja pole määratud."
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Käsurida ei ole sisestatud."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Sihtkaust pole määratud."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+#, fuzzy
+msgid "Rule name is not specified."
+msgstr "Saaja pole määratud."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Käsurida ei ole sisestatud."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 #, fuzzy
 msgid "Action not exist."
 msgstr "faili %s ei leidu\n"
@@ -6108,15 +6121,20 @@ msgstr "ainult loetav"
 msgid "unknown"
 msgstr "tundmatu"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "Ei saanud uudistegrupi nimistut."
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Ei saanud uudistegrupi nimistut."
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Tehtud."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "saadi %d uudistegruppi (%s loetud)"
diff --git a/po/fr.po b/po/fr.po
index 4f6ae636..8165fbc8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+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,9 +26,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Lecture de la configuration des comptes...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "Échec d'écriture de la configuration dans le fichier\n"
@@ -51,177 +51,177 @@ msgstr "création de la connexion IMAP4 vers %s:%d ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "Impossible d'initier la session TLS.\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Suppression du message %d"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Envoi du message (%d / %d octets)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Copie du message %s%c%d vers %s ...\n"
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copie du message %s%c%d vers %s ...\n"
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Réception des messages de %s..."
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "impossible de marquer pour la suppression : %s\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "impossible de purger\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Réception des messages de %s..."
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 msgid "can't set deleted flags: 1:*\n"
 msgstr "impossible de marquer pour la suppression : 1 : *\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 msgid "can't close folder\n"
 msgstr "impossible de fermer le dossier\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "le dossier racine %s n'existe pas\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 msgid "error occurred while getting LIST.\n"
 msgstr "Une erreur est survenue lors de la réception de LIST.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Impossible de créer « %s »\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Impossible de créer « %s » sous Réception \n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Impossible de créer la boîte aux lettres : LIST échoué.\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "impossible de créer la boîte aux lettres\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, 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:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "impossible de supprimer la boîte aux lettres\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "Impossible de faire une enveloppe\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Envoi du message (%d / %d octets)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "erreur lors de la lecture de l'enveloppe.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "impossible d'analyser l'enveloppe : %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, 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:2475
+#: libsylph/imap.c:2487
 #, 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:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "Impossible d'obtenir l'espace nom\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Impossible de sélectionner le dossier : %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "erreur avec la commande IMAP : CLOSE\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 msgid "IMAP4 authentication failed.\n"
 msgstr "L'authentification IMAP4 a échoué.\n"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "Échec au login IMAP4.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "Impossible de d'ajouter %s à %s\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(envoi du fichier...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "impossible d'ajouter le message à %s\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "impossible de copier %s vers %s\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erreur avec la commande IMAP : STORE %s %s\n"
 
-#: libsylph/imap.c:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erreur lors de la commande IMAP : EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 msgid "error while imap command: CLOSE\n"
 msgstr "erreur avec la commande IMAP : CLOSE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, 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:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne peut convertir de %s vers UTF-7\n"
@@ -308,30 +308,30 @@ msgstr "Impossible de vider la boîte aux lettres.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportation des messages de %s vers %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "Impossible de copier le message de %s à %s\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "Impossible d'ouvrir le fichier des marques.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "dossier source identique à la destination.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copie du message %s%c%d vers %s ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Dernier numéro dans le répertoire %s = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -340,7 +340,7 @@ msgstr ""
 "Le fichier « %s » existe déjà.\n"
 "Impossible de créer le dossier."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -370,71 +370,71 @@ msgstr "Création de la connexion NNTP vers %s:%d ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "La connexion NNTP vers %s:%d a été coupée. Reconnexion...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "L'article %d a déjà été caché.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "Récupération de l'article %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "Impossible de lire l'article %d\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "Impossible d'obtenir la liste des groupes de discussion\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "Impossible de poster l'article.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "Impossible de récupérer l'article %d\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "impossible de sélectionner le groupe : %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "Intervalle d'articles invalide : %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "Pas d'article.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "Exécution de xover %d - %d sur %s...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "Impossible de faire un xover\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "Une erreur a eu lieu pendant la lecture du xover.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "Ligne xover invalide : %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "Impossible d'obtenir xhdr\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "Erreur lors de la réception de xhdr.\n"
 
@@ -530,16 +530,16 @@ msgstr "Dossier des messages indésirables"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): la conversion de code a échoué.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "Impossible d'ouvrir le fichier des marques\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "impossible de récupérer le message %d\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La ligne de commande d'impression est invalide : « %s »\n"
@@ -730,12 +730,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Nom"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Protocole"
 
@@ -743,7 +743,7 @@ msgstr "Protocole"
 msgid "Server"
 msgstr "Serveur"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Éditer"
 
@@ -756,7 +756,7 @@ msgstr "_Définir comme compte par défaut"
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Voulez-vous vraiment supprimer le compte « %s » ?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 msgid "(Untitled)"
 msgstr "(Sans titre)"
 
@@ -1007,7 +1007,7 @@ msgstr "Adresse électronique"
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Nom :"
 
@@ -1022,7 +1022,7 @@ msgstr "Supprimer"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Ajouter"
 
@@ -1196,7 +1196,7 @@ msgid "Group"
 msgstr "Groupe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Dossier"
 
@@ -1718,12 +1718,12 @@ msgid "MIME type"
 msgstr "Type MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Envoyer"
@@ -1765,7 +1765,7 @@ msgid "Attach file"
 msgstr "Joindre un fichier"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Signature"
@@ -1975,7 +1975,7 @@ msgid " Check File "
 msgstr " Vérifier le fichier "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Fichier"
 
@@ -2054,7 +2054,7 @@ msgid "Edit JPilot Entry"
 msgstr "Édition de données JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2119,7 +2119,7 @@ msgstr "Délai d'attente (secs)"
 msgid "Maximum Entries"
 msgstr "Nombre maximal d'entrées"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Général"
 
@@ -2177,7 +2177,7 @@ msgid "Exporting file:"
 msgstr "Fichier mbox :"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr " Choisir... "
 
@@ -3649,7 +3649,7 @@ msgstr "Relever le courrier de tous les comptes"
 msgid "Send queued message(s)"
 msgstr "Envoyer les messages en attente"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Composer"
@@ -3674,7 +3674,7 @@ msgstr "À tous"
 msgid "Reply to all"
 msgstr "Répondre à tous"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Transférer"
 
@@ -3952,213 +3952,213 @@ msgstr ""
 "Phrase secrète incorrecte. Autre tentative...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Ouverture de la fenêtre de configuration du compte...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Compte%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Configuration du nouveau compte"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Configuration du compte"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Création de la fenêtre de configuration du compte...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Réception"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Confidentialité"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Avancée"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Nom du compte"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "Définir comme compte par défaut"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Informations personnelles"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Nom complet"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "Adresse électronique"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Configuration des serveurs"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Aucun (local)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Ce serveur nécessite une authentification"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "Serveur de groupes de discussion"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Serveur de réception"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "Serveur SMTP (envoi)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "Nom de l'utilisateur"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Mot de passe"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 msgid "Use secure authentication (APOP)"
 msgstr "Utiliser l'authentification sécurisée (APOP)"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Suppression des messages du serveur après réception"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "Supprimer après"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "jours"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 jours : supprimer immédiatement)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Réception de tous les messages sur le serveur"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "Taille maximale pour la réception"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr "Ko"
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Filtrage des messages à la réception"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Boîte de réception par défaut"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Les messages non filtrés seront placés dans ce dossier."
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "Méthode d'authentification"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "Articles de groupes de discussion"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 msgid "Maximum number of articles to download"
 msgstr "Nombre maximum d'articles à récupérer"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 msgid "No limit if 0 is specified."
 msgstr "Aucune limite pour la valeur 0."
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "« Tout relever » relève le courrier pour ce compte"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "En-tête"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Ajouter un champ « Date » à l'en-tête"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Génération d'un Message-ID"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Ajouter des en-têtes supplémentaires"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " Modifier... "
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Authentification"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Authentification SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4166,177 +4166,190 @@ msgstr ""
 "Laissez ces champs vides pour utiliser le nom d'utilisateur et le mot de "
 "passe spécifiés pour la réception."
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "S'authentifier sur le POP3 avant l'envoi"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 msgid "Command output"
 msgstr "Sortie"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Définition automatique des adresses suivantes"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Copie"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Copie discrète"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Répondre à"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Signer le message par défaut"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "Chiffrer le message par défaut"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr "Chiffrer les réponses à un message chiffré"
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "Utiliser le format ASCII-armé pour le chiffrement"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "Utiliser une signature non chiffrée"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Clé de signature"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Utiliser la clé par défaut de GnuPG"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Sélectionner la clé en fonction de l'adresse électronique"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Indiquer manuellement la clé"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "Utilisateur ou identificateur (ID) de clé :"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "Ne pas utiliser SSL"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "Utiliser SSL pour les connexions POP3"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Utiliser la commande STARTTLS pour commencer une session SSL"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "Utiliser SSL pour les connexions IMAP4"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "Utiliser SSL pour les connexions NNTP"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Envoi (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "Utiliser SSL pour les connexions SMTP"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr "Utiliser SSL non-bloquant"
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Désactivez ceci si vous rencontrez des problèmes de connexion SSL."
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "Indiquer le port SMTP"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "Indiquer le port POP3"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "Indiquer le port IMAP4"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "Indiquer le port NNTP"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Indiquer le nom de domaine"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "Répertoire IMAP4"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "Placer les messages envoyés dans"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "Placer les brouillons dans"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Placer les messages supprimés dans"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "Placer les messages supprimés dans"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "Nom du compte non indiqué."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "Adresse électronique non saisie."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "Serveur SMTP non indiqué."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "Nom d'utilisateur manquant."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "Serveur POP3 non indiqué."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "Serveur IMAP4 non indiqué."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "Serveur NNTP non indiqué."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5327,7 +5340,7 @@ msgstr "Ancien Sylpheed"
 msgid "Custom header setting"
 msgstr "Édition des en-têtes supplémentaires"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr " Supprimer "
 
@@ -5383,197 +5396,197 @@ msgstr "Ecriture de la configuration de l'affichage des en-têtes...\n"
 msgid "This header is already in the list."
 msgstr "Cet en-tête est déjà dans la liste."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Règles de filtrage"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr "Activé"
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Voulez-vous vraiment supprimer la règle « %s » ?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Supprimer une règle"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 msgid "Filter rule"
 msgstr "Règle de filtrage"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr "Si au moins une des conditions suivantes est remplie"
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr "Si toutes les conditions suivantes sont remplies"
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr "Effectuer les actions suivantes :"
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr "To ou Cc"
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 msgid "Any header"
 msgstr "Tout en-tête"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 msgid "Edit header..."
 msgstr "Éditer l'en-tête..."
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 msgid "Message body"
 msgstr "Corps du message"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr "Résultat de la commande"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr "Age"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "contient"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 msgid "doesn't contain"
 msgstr "ne contient pas"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr "est"
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr "n'est pas"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr "vérifie l'expression régulière"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr "ne vérifie pas l'expression régulière"
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr "est plus grand que"
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr "est plus petit que"
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr "est plus long que"
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr "est plus court que"
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 msgid "Move to"
 msgstr "Déplacer vers"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 msgid "Copy to"
 msgstr "Copier vers"
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Ne pas recevoir"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 msgid "Delete from server"
 msgstr "Effacer du serveur"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 msgid "Set mark"
 msgstr "Marquer"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 msgid "Set color"
 msgstr "Colorer"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 msgid "Forward as attachment"
 msgstr "Transférer en pièce jointe"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 msgid "Redirect"
 msgstr "Rediriger"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 msgid "Execute command"
 msgstr "Exécuter la commande"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr "Arrêter l'évaluation de la règle"
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 msgid "folder:"
 msgstr "dossier :"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 msgid "day(s)"
 msgstr "jour(s)"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 msgid "address:"
 msgstr "adresse :"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 msgid "Edit header list"
 msgstr "Éditer la liste des en-têtes"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 msgid "Headers"
 msgstr "En-têtes"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 msgid "Header:"
 msgstr "En-tête :"
 
-#: src/prefs_filter_edit.c:1679
-msgid "Rule name is not specified."
-msgstr "Le nom de la règle n'est pas spécifié."
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 msgid "Command is not specified."
 msgstr "La commande n'a pas été définie."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr "Une condition invalide est présente."
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 msgid "Destination folder is not specified."
 msgstr "Le dossier cible n'a pas été défini."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+msgid "Rule name is not specified."
+msgstr "Le nom de la règle n'est pas spécifié."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr "Une condition invalide est présente."
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr "Une action invalide est présente."
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 msgid "Condition not exist."
 msgstr "La condition n'existe pas."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 msgid "Action not exist."
 msgstr "L'action n'existe pas."
 
@@ -6022,15 +6035,20 @@ msgstr "lecture uniquement"
 msgid "unknown"
 msgstr "inconnu"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "Impossible d'obtenir la liste des groupes de discussion."
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Impossible d'obtenir la liste des groupes de discussion."
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Terminé."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d groupes de discussion reçus (%s lu)"
diff --git a/po/gl.po b/po/gl.po
index 14526c6d..c64d2984 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -18,9 +18,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Lendo configuración de cada conta...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "fallo escribiendo a configuración a ficheiro\n"
@@ -44,181 +44,181 @@ msgstr "creando conexión IMAP4 con %s:%d ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "Non podo iniciar a sesión TLS.\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Borrando mensaxe %d"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Enviando mensaxe (%d / %d bytes)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Movendo mensaxe %s%c%d a %s ...\n"
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiando mensaxe %s%c%d a %s ...\n"
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "non podo establecer os indicadores borrados: %d\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "non podo baleirar\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "non podo establecer os indicadores borrados: 1:%d\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "non se pode seleccionar a carpeta: %s\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Ficheiro de marcas non atopado.\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 msgid "error occurred while getting LIST.\n"
 msgstr "ocurriu un erro obtendo LIST.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Non podo crear '%s'\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Non podo crear '%s' bajo Entrada\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "non podo crear a: LIST falló\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "non podo crear a caixa de correo\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, 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:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "non podo borrar a caixa de correo\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "non se pode obter a estructura da mensaxe\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Enviando mensaxe (%d / %d bytes)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "Erro obtendo a estructura da mensaxe.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "Non se pode interpretar a estructura da mensaxe: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, 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:2475
+#: libsylph/imap.c:2487
 #, 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:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "no se pode obter o espacio de nomes\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "non se pode seleccionar a carpeta: %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Fallo de autenticación"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificación IMAP4 fallida.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "non podo engadir %s a %s\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(enviando ficheiro...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "non se pode engadir o mensaxe %s\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "non podo copiar %d a %s\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, 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:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv non pode convertir UTF-7 a %s\n"
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non pode convertir %s a UTF-7\n"
@@ -305,30 +305,30 @@ msgstr "non se pode truncar a cero a caixa de correo.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportando mensaxes de %s a %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "non se pode copiar mensaxe %s a %s\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "Non se pode abrir o ficheiro de marcas.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "carpetas de orixen e destiño idénticas.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copiando mensaxe %s%c%d a %s ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Último número en directorio %s = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -337,7 +337,7 @@ msgstr ""
 "o Ficheiro `%s' xa existe.\n"
 "Non podo crear a carpeta."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -359,71 +359,71 @@ msgstr "creando conexión NNTP con %s:%d ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "perdeuse a conexión NNTP con %s:%d . Reconectando...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "o artigo %d xa esta en caché.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "obtendo artigo %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "no podo leer o artículo %d\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "no podo obter a lista de grupos\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "no se pode enviar o artículo.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "no podo obter o artículo %d\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "non podo seleccionar grupo %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "rango de artículos no válido: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "no hai artículos novos.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obteniendo xover %d - %d en %s...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "no se pode obtener xover\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "ocurriu un erro obtendo xover.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "linea xover non válida: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "non se pode obter xhdr\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "ocurriu un erro obtendo xhdr.\n"
 
@@ -519,16 +519,16 @@ msgstr "Carpeta"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Conversión de códigos fallida.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "no se pode abrir o ficheiro de marcas\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "non se pode obter o mensaxe %d\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "o comando de impresión non é válido: `%s'\n"
@@ -718,12 +718,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Nome"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -731,7 +731,7 @@ msgstr "Protocolo"
 msgid "Server"
 msgstr "Servidor"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Editar"
 
@@ -745,7 +745,7 @@ msgstr " conta por defecto "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "¿Realmente quere borrar esta conta?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Sen título"
@@ -995,7 +995,7 @@ msgstr "Enderezo e-mail"
 msgid "Address book"
 msgstr "Axenda de enderezos"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Nome:"
 
@@ -1010,7 +1010,7 @@ msgstr "Borrar"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Engadir"
 
@@ -1184,7 +1184,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -1738,12 +1738,12 @@ msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Enviar"
@@ -1785,7 +1785,7 @@ msgid "Attach file"
 msgstr "Adxuntar ficheiro"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Sinatura"
@@ -1998,7 +1998,7 @@ msgid " Check File "
 msgstr " Comprobar ficheiro "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Ficheiro"
 
@@ -2076,7 +2076,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2141,7 +2141,7 @@ msgstr "Tiempo límite (seg.)"
 msgid "Maximum Entries"
 msgstr "Nº entradas máximas"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Basico"
 
@@ -2199,7 +2199,7 @@ msgid "Exporting file:"
 msgstr "Ficheiro de exportación:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr "Seleccionar..."
 
@@ -3690,7 +3690,7 @@ msgstr "Incorporar correo novo de todas as contas"
 msgid "Send queued message(s)"
 msgstr "Enviar mensaxe(s) na cola"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Compoñer"
@@ -3715,7 +3715,7 @@ msgstr "A todos"
 msgid "Reply to all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Reenviar"
 
@@ -3997,219 +3997,219 @@ msgstr ""
 "¡Contrasinal erróneo! Intenteo de novo...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Abrindo Fiestra de preferencias de conta...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "conta%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Preferencias para unha nova conta"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Preferencias da conta"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Creando Fiestra de preferencias de conta...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Avanzadas"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Nome desta conta"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "conta por defecto"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Información persoal"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Nome completo"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "Enderezo de correo"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Organización"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Información do servidor"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "Novas (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Ningunha (local)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Este servidor require autenticación"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "Servidor de novas"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Servidor de recepción"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "Usuario"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Contrasinal"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Este servidor require autenticación"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Eliminar mensaxes do servidor ó recibir"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "Eliminar despois de"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "días"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 días: eliminar inmediatamente)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Descargar todas as mensaxes do servidor"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "Tamaño límite para recibir"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensaxes ó recibir"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Caixa de correo por defecto"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(As mensaxes sen filtrar gardaránse nesta carpeta)"
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "Método de autenticación"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Automática"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "Novas"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Número máximo de artigos a descargar\n"
 "(sen límite si se especifica 0)"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Traer todo' comproba si hai mensaxes novas nesta conta"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Cabeceira"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Engadir campo Data"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Xenerar ID-Mensaxe"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Engadir cabeceira de usuario"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " Editar... "
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticación SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4218,178 +4218,191 @@ msgstr ""
 "Si deixa estes campos valeiros, utilizaráse o mesmo\n"
 "ID de usuario e contrasinal usados para a recepción."
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Autenticación con POP3 antes de enviar"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 #, fuzzy
 msgid "Command output"
 msgstr "Saida do comando"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Establecer os seguintes enderezos automáticamente"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Respostar a"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Asinar a mensaxe por defecto"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "Encriptar a mensaxe por defecto"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "Usar formato ASCII blindado para encriptación"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "Usar sinatura de texto claro"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Asinar clave"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Usar clave GnuPG por defecto"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Seleccionar clave por dirección de correo"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Especificar clave manualmente"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "Usuario ou ID clave:"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "Non usar SSL"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "Usar SSL para a conexión POP3"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usar o comando STARTTLS para abrir a sesión SSL"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usar SSL para a conexión IMAP4"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para a conexión NNTP"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "Usar SSL para a conexión SMTP"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "Porto SMTP"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "Porto POP3"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "Porto IMAP4"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "Porto NNTP"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Nome do dominio"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "Directorio do servidor IMAP4"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "Poñer mensaxes enviadas en"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "Poñer borradores de mensaxes en"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Poñer mensaxes borradas en"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "Poñer mensaxes borradas en"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "Non se especificou o nome de conta."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "Non se especificou o enderezo de correo."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "Non se especificou o servidor SMTP."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "Non se especificou o usuario."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "Non se especificou o servidor POP3."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "Non se especificou o servidor IMAP4."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "Non se especificou o servidor NNTP."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5389,7 +5402,7 @@ msgstr "Antigos de Sylpheed"
 msgid "Custom header setting"
 msgstr "Configuración de cabeceiras de usuario"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr " Borrar "
 
@@ -5445,221 +5458,221 @@ msgstr "Escribindo configuración para mostrar cabeceiras...\n"
 msgid "This header is already in the list."
 msgstr "Esa cabeceira xa existe na lista."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Preferencias de filtrado"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "¿Quere borrar realmente esta regra?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Borrar regra"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 #, fuzzy
 msgid "Filter rule"
 msgstr "Borrar regra"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 #, fuzzy
 msgid "Any header"
 msgstr "cabeceiras ocultas"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 #, fuzzy
 msgid "Edit header..."
 msgstr "Cabeceira"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 #, fuzzy
 msgid "Message body"
 msgstr "Mensaxe"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "conten"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 #, fuzzy
 msgid "doesn't contain"
 msgstr "non conten"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 #, fuzzy
 msgid "Move to"
 msgstr "Abaixo"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 #, fuzzy
 msgid "Copy to"
 msgstr "/_Copiar..."
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Non recibir"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 #, fuzzy
 msgid "Delete from server"
 msgstr "Borrar carpeta"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 #, fuzzy
 msgid "Set mark"
 msgstr "Notas"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 #, fuzzy
 msgid "Set color"
 msgstr "Cores do mensaxe"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 #, fuzzy
 msgid "Mark as read"
 msgstr "/_Marcar/Marcar como _leído"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/Reen_viar como adxunto"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 #, fuzzy
 msgid "Redirect"
 msgstr "/Red_irixir"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 #, fuzzy
 msgid "Execute command"
 msgstr "Executar"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 #, fuzzy
 msgid "folder:"
 msgstr "Carpeta"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 #, fuzzy
 msgid "day(s)"
 msgstr "días"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 #, fuzzy
 msgid "address:"
 msgstr "Enderezo"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 #, fuzzy
 msgid "Edit header list"
 msgstr "Cabeceira"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 #, fuzzy
 msgid "Headers"
 msgstr "Cabeceira"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 #, fuzzy
 msgid "Header:"
 msgstr "Cabeceira"
 
-#: src/prefs_filter_edit.c:1679
-#, fuzzy
-msgid "Rule name is not specified."
-msgstr "Non se especificou o destinatario."
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Non se estableceu o comando."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Non se especificou destinatario."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+#, fuzzy
+msgid "Rule name is not specified."
+msgstr "Non se especificou o destinatario."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Non se estableceu o comando."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: o ficheiro non existe\n"
@@ -6106,15 +6119,20 @@ msgstr "so lectura"
 msgid "unknown"
 msgstr "desconecido"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "Non se pode obter a lista de grupos."
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Non se pode obter a lista de grupos."
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Feito."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d grupos de novas recibidos (%s leídos)"
diff --git a/po/hr.po b/po/hr.po
index 8005a394..ca237797 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+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,9 +18,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Čitam konfiguracije za svaki račun...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "neuspjeh pri pisanju konfiguracije u datoteku\n"
@@ -44,183 +44,183 @@ msgstr "ostvarujem IMAP4 vezu prema %s:%d ...\n"
 msgid "Can't start TLS session.\n"
 msgstr ""
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Brišem poruke"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Šaljem poruku (%d / %d bytea)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Premještam poruke %s%c%d u %s ...\n"
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ne mogu postaviti obrisane oznake: %d\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "ne mogu obrisati\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ne mogu postaviti obrisane oznake: 1:%d\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Označena datoteka ne postoji.\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "došlo je do greške prilikom dobivanja LISTe.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, fuzzy, c-format
 msgid "Can't create '%s'\n"
 msgstr "ne mogu kreirati %s\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, fuzzy, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "ne mogu kreirati %s\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ne mogu kreirati sandučić: LIST nije uspio\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "ne mogu kreirati sandučić\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, fuzzy, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ne mogu kreirati sandučić\n"
 
-#: libsylph/imap.c:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "ne mogu obrisati sandučić\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "ne mogu dobiti omot\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Šaljem poruku (%d / %d bytea)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "došlo je do greške prilikom dobivanja omota.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ne mogu analizirati omot: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, 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:2475
+#: libsylph/imap.c:2487
 #, 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:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "ne mogu dobiti namespace\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autorizacija"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login propao.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne mogu pričvrstiti %s na %s\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 #, fuzzy
 msgid "(sending file...)"
 msgstr "Šaljem DATA..."
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne mogu obilježiti poruku %s\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne mogu kopirati %d u %s\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, 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:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr ""
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
@@ -307,30 +307,30 @@ msgstr "ne mogu skratiti sandučić na nulu.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Izvozim poruke iz %s u %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ne mogu kopirati poruku %s u %s\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "Ne mogu otvoriti označenu datoteku.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "izvorni spis jednak je destinaciji.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Posljednji broj u direktoriju %s = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -339,7 +339,7 @@ msgstr ""
 "Datoteka `%s' već postoji.\n"
 "Ne mogu stvoriti spis."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -361,71 +361,71 @@ msgstr "uspostavljam NNTP vezu s %s:%d ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP veza s %s:%d je pukla. Povezujem ponovo...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "članak %d već je pohranjen.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "primam članak %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "ne mogu pročitati članak %d\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "ne mogu primiti listu news grupa\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "ne mogu poslati članak.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "ne mogu primiti članak %d\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "ne mogu odabrati grupu %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "pogrešan opseg članaka: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "nema novih članaka.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "primam xover %d - %d u %s...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "ne mogu dobiti xover\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "došlo je do greške prilikom dobivanja xovera.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "pogrešna xover linija: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "ne mogu dobiti xhdr\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "došlo je do greške prilikom dobivanja xhdra.\n"
 
@@ -525,16 +525,16 @@ msgstr "Spis"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Promjena koda nije uspjela.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "ne mogu otvoriti obilježenu datoteku\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ne mogu dohvatiti poruku %d\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Naredba za ispis nije dobra: `%s'\n"
@@ -725,12 +725,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Ime"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -738,7 +738,7 @@ msgstr "Protokol"
 msgid "Server"
 msgstr "Poslužitelj"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Uredi"
 
@@ -752,7 +752,7 @@ msgstr " Postavi kao uobičajeni račun "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Želite li usitinu obrisati ovaj račun?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Neimenovano"
@@ -1000,7 +1000,7 @@ msgstr "E-mail adresa"
 msgid "Address book"
 msgstr "Adresar"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Ime:"
 
@@ -1015,7 +1015,7 @@ msgstr "Obriši"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Dodaj"
 
@@ -1181,7 +1181,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Spis"
 
@@ -1746,12 +1746,12 @@ msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Pošalji"
@@ -1793,7 +1793,7 @@ msgid "Attach file"
 msgstr "Priloži datoteku"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Potpis"
@@ -2009,7 +2009,7 @@ msgid " Check File "
 msgstr " Provjeri datoteku "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Datoteka"
 
@@ -2087,7 +2087,7 @@ msgid "Edit JPilot Entry"
 msgstr "Uredite JPilot unos"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2152,7 +2152,7 @@ msgstr "Timeout (sek)"
 msgid "Maximum Entries"
 msgstr "Max. Unos"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Osnovno"
 
@@ -2209,7 +2209,7 @@ msgid "Exporting file:"
 msgstr "Iznosim datoteku:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr " Odaberite... "
 
@@ -3788,7 +3788,7 @@ msgstr "Prima novu poštu sa svih računa"
 msgid "Send queued message(s)"
 msgstr "Šalje odložene poruke"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Kreiraj"
@@ -3813,7 +3813,7 @@ msgstr "Odgovori s."
 msgid "Reply to all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Proslijedi"
 
@@ -4098,407 +4098,420 @@ msgstr ""
 "Pogrešna lozinka! Pokušajte ponovo...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Otvaram prozor za postavke računa...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Račun%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Postavke za novi račun"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Postavke računa"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Kreiram prozor za postvake računa...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Primanje"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Privatnost"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Ime ovog računa"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "Postavi kao uobičajeni"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Osobne informacije"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Puno ime"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "E-mail adresa"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Organizacija"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Informacije o poslužitelju"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Ništa (lokalno)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Ovaj server zahtijeva autorizaciju"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "News poslužitelj"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Poslužitelj za primanje"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "SMTP poslužitelj (slanje)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "ID korisnika"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Lozinka"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Ovaj server zahtijeva autorizaciju"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Ukloni poruke sa poslužitelja nakon primanja"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 #, fuzzy
 msgid "Remove after"
 msgstr "Ukloni spis"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 #, fuzzy
 msgid "days"
 msgstr "Uvijek"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr ""
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Primi sve poruke sa poslužitelja"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 #, fuzzy
 msgid "Receive size limit"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Filtriraj poruke pri primanju"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Uobičajeni sandučić"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nefiltrirane poruke biti će spremljene u ovaj spis)"
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 #, fuzzy
 msgid "Authentication method"
 msgstr "Autorizacija"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr ""
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maksimalni broj članaka za skidanje\n"
 "(0 je za neograničeno)"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Nije upisan primatelj."
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 #, fuzzy
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Primi sve' uzima poštu s ovog računa"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Zaglavlje"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Dodaj polje Datum u zaglavlje"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Generiraj ID poruke"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Dodatna zaglavlja"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " Uredi... "
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Autorizacija"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP autorizacija (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Autoriziraj s POP3 prije slanja"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 #, fuzzy
 msgid "Command output"
 msgstr "Naredba"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Automatski postavi slijedeće adrese"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Odvovori-Na"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Uvijek potpiši poruke"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "Uvijek kriptiraj poruke"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 #, fuzzy
 msgid "Use clear text signature"
 msgstr "Unesi potpis"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Ključ potpisa"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Koristi uobičajeni GnuPG ključ"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Odaberi ključ po e-mail adresi"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Neki drugi ključ"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "ID ključa ili korisnika:"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "Ne koristi SSL"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "Koristi SSL za POP3 veze"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Korsiti STARTTLS naredbu za pokretanje SSL-a"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "Koristi SSL za IMAP4 veze"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 #, fuzzy
 msgid "Use SSL for NNTP connection"
 msgstr "Koristi SSL za SMTP veze"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Slanje (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "Koristi SSL za SMTP veze"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "Specificirani SMTP port"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "Specificirani POP3 port"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "Specificirani IMAP4 port"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "Specificirani NNTP port"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Specificirano ime domene"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "Direktorij IMAP poslužitelja"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 #, fuzzy
 msgid "Put sent messages in"
 msgstr "Spremi poslane poruke u poslano"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 #, fuzzy
 msgid "Put draft messages in"
 msgstr "Sažmi poruke na"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Obriši poruku/e"
+
+#: src/prefs_account_dialog.c:1723
 #, fuzzy
 msgid "Put deleted messages in"
 msgstr "Obriši poruku/e"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 #, fuzzy
 msgid "Account name is not entered."
 msgstr "E-mail adresa nije upisana."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "E-mail adresa nije upisana."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "SMTP poslužitelj nije upisan."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "ID korisnika nije upisan."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "POP3 poslužitelj nije upisan."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 poslužitelj nije upisan."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "NNTP poslužitelj nije upisan."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5485,7 +5498,7 @@ msgstr ""
 msgid "Custom header setting"
 msgstr "Postaljvanje određenog zaglavlja"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr " Obriši "
 
@@ -5541,221 +5554,221 @@ msgstr "Pišem konfiguraciju za prikaz zaglavlja...\n"
 msgid "This header is already in the list."
 msgstr "Ovo zaglavlje je već na listi."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Postavke filtera"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Uistinu obrisati pravilo?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Obriši pravilo"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 #, fuzzy
 msgid "Filter rule"
 msgstr "Obriši pravilo"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 #, fuzzy
 msgid "Any header"
 msgstr "Svo zaglavlje"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 #, fuzzy
 msgid "Edit header..."
 msgstr "Zaglavlje"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 #, fuzzy
 msgid "Message body"
 msgstr "Pošta"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "sadrži"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 #, fuzzy
 msgid "doesn't contain"
 msgstr "ne sadrži"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 #, fuzzy
 msgid "Move to"
 msgstr "Pomakni dolje"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 #, fuzzy
 msgid "Copy to"
 msgstr "/_Kopiraj..."
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Ne primaj"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 #, fuzzy
 msgid "Delete from server"
 msgstr "Obriši spis"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 #, fuzzy
 msgid "Set mark"
 msgstr "Bilješke"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 #, fuzzy
 msgid "Set color"
 msgstr "Postavi boje poruka"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 #, fuzzy
 msgid "Mark as read"
 msgstr "/_Označi/Označi kao _pročitano"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/Proslijedi kao prilo_g"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 #, fuzzy
 msgid "Redirect"
 msgstr "/Pre-_uredi"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 #, fuzzy
 msgid "Execute command"
 msgstr "Izvrši"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 #, fuzzy
 msgid "folder:"
 msgstr "Spis"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 #, fuzzy
 msgid "day(s)"
 msgstr "Uvijek"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 #, fuzzy
 msgid "address:"
 msgstr "Adresa"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 #, fuzzy
 msgid "Edit header list"
 msgstr "Zaglavlje"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 #, fuzzy
 msgid "Headers"
 msgstr "Zaglavlje"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 #, fuzzy
 msgid "Header:"
 msgstr "Zaglavlje"
 
-#: src/prefs_filter_edit.c:1679
-#, fuzzy
-msgid "Rule name is not specified."
-msgstr "Nije upisan primatelj."
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Ime zaglavlja nije postavljeno."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Destinacija nije postavljena."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+#, fuzzy
+msgid "Rule name is not specified."
+msgstr "Nije upisan primatelj."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Ime zaglavlja nije postavljeno."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: datoteka ne postoji\n"
@@ -6207,15 +6220,20 @@ msgstr "read only"
 msgid "unknown"
 msgstr "nepoznato"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "Ne mogu pronaći listu news grupa."
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Ne mogu pronaći listu news grupa."
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Gotovo."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d news grupa primljeno (%s pročitano)"
diff --git a/po/hu.po b/po/hu.po
index d2dae8ca..5707b61c 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: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+0900\n"
 "PO-Revision-Date: 2005-07-04 17:05+0200\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: <NONE>\n"
@@ -19,9 +19,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Beállítások beolvasása az összes hozzáféréshez...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "a beállításokat nem lehetett elmenteni\n"
@@ -44,177 +44,177 @@ msgstr "%s:%d IMAP4 kapcsolat létrehozása ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "Nem lehet TLS menetet indítani.\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "%d üzenet törlése"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Üzenet küldése (%d / %d bájt)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "%s%c%d üzenet másolása %s-ba ...\n"
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "%s%c%d üzenet másolása %s-ba ...\n"
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "%s üzeneteinek fogadása..."
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, 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:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "nem lehet törölni\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "%s üzeneteinek fogadása..."
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 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:1609
+#: libsylph/imap.c:1621
 msgid "can't close folder\n"
 msgstr "mappa bezárása nem sikerült\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "%s root mappa nem létezik\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 msgid "error occurred while getting LIST.\n"
 msgstr "hiba történt a LISTA lekérdezése közben.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "'%s' nem hozható létre\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, 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:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nem lehet létrehozni postaládát: LISTA sikertelen\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "nem lehet létrehozni postaládát\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, 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:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "nem lehet törölni a postaládát\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "a borítékot nem lehet megszerezni\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Üzenet küldése (%d / %d bájt)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "hiba történt a boríték fogadása közben.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "nem lehet értelmezni a borítékot: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, 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:2475
+#: libsylph/imap.c:2487
 #, 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:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "névtér nem elérhető\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "%s mappa kiválasztása nem sikerült\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "hiba az IMAP parancs közben: CLOSE\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 msgid "IMAP4 authentication failed.\n"
 msgstr "Az IMAP4 azonosítás nem sikerült.\n"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 bejelentkezés sikertelen.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s hozzáfűzése %s-he(oö)z nem sikerült\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(fájl küldése...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "üzenet hozzáfűzése %s-he(oö)z nem sikerült\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s nem másolható %s-be/ba\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, 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:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "hiba az IMAP parancs közben: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 msgid "error while imap command: CLOSE\n"
 msgstr "hiba az IMAP parancs közben: CLOSE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "az iconv nem tud UTF-7-ből %s-be/ba konvertálni\n"
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "az iconv nem tud %s-t UTF-7-re konvertálni\n"
@@ -301,30 +301,30 @@ msgstr "nem lehet nulla méretűre változtatni a postafiókot.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Üzenetek exportálása %s-ból %s-ba...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "Nem lehet %s üzenetet %s-ba másolni\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "A jelölő fájlt nem lehet megnyitni.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "A forrás- és célmappa azonos.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "%s%c%d üzenet másolása %s-ba ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Az utolsó szám a(z) %s mappában = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -333,7 +333,7 @@ msgstr ""
 "`%s' fájl már létezik.\n"
 "Mappa nem hozható létre."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -362,71 +362,71 @@ msgstr "NNTP kapcsolat létesítése %s:%d ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "Az NNTP kapcsolat %s:%d megszakadt. Újrakapcsolódás...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "%d cikk már a gyorstárban van.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "%d cikk fogadása...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "%d cikket nem lehetett olvasni\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "Hírcsoport lista nem hozzáférhető\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "Nem lehet a cikket elküldeni.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "%d cikket nem lehet fogadni\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "%s csoport nem választható ki\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "érvénytelen cikk sorozat: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "Nincsenek új cikkek.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "Hírjegyzék fogadása %d - %d %s-ba...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "A hírjegyzék nem elérhető\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "Hiba a hírjegyzék fogadása közben.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "érvénytelen hírjegyzék sor: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "xhdr nem elérhető\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "Hiba történt xhdr vétele közben.\n"
 
@@ -520,16 +520,16 @@ msgstr "Levélszemét szűrő"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Kód konverziós hiba.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "A kijelölt fájl nem nyitható meg\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "%d üzenet vétele nem sikerült\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Érvénytelen nyomtató parancs: `%s'\n"
@@ -721,12 +721,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Név"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -734,7 +734,7 @@ msgstr "Protokoll"
 msgid "Server"
 msgstr "Szerver"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Szerkesztés"
 
@@ -747,7 +747,7 @@ msgstr " Alapértelmezett hozzá_férésként beállít "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Tényleg törölni szeretné  a(z) '%s' hozzáférést?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 msgid "(Untitled)"
 msgstr "(Névtelen)"
 
@@ -999,7 +999,7 @@ msgstr "E-Mail cím"
 msgid "Address book"
 msgstr "Címjegyzék"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Név:"
 
@@ -1014,7 +1014,7 @@ msgstr "Törlés"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Hozzáadás"
 
@@ -1182,7 +1182,7 @@ msgid "Group"
 msgstr "Csoport"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Mappa"
 
@@ -1703,12 +1703,12 @@ msgid "MIME type"
 msgstr "MIME típus"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Küldés"
@@ -1750,7 +1750,7 @@ msgid "Attach file"
 msgstr "Fájl csatolása"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Aláírás"
@@ -1958,7 +1958,7 @@ msgid " Check File "
 msgstr " Fájl ellenőrzése"
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Fájl"
 
@@ -2036,7 +2036,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot bejegyzés szerkesztése"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2101,7 +2101,7 @@ msgstr "Időtúllépés (mp)"
 msgid "Maximum Entries"
 msgstr "Maximális bejegyzések"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Alap"
 
@@ -2158,7 +2158,7 @@ msgid "Exporting file:"
 msgstr "Exportálás fájlba:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr " Kiválaszt... "
 
@@ -3620,7 +3620,7 @@ msgstr "Új levelek fogadása minden hozzáférésen"
 msgid "Send queued message(s)"
 msgstr "Várakozó sorból üzenet(ek) küldése"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Szerkesztés"
@@ -3645,7 +3645,7 @@ msgstr "Válasz mindre"
 msgid "Reply to all"
 msgstr "Válasz mindenkinek"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Továbbít"
 
@@ -3925,213 +3925,213 @@ msgstr ""
 "Rossz jelmondat! Próbálja újra...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Hozzáférésbeállításokok ablak megnyitása...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Hozzáférés%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Új hozzáférés beállításai"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Hozzáférés beállítások"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Hozzáférésbeállítások ablak létrehozása...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Fogadás"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Magánszféra"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Haladó"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Hozzáférés neve"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "Alapértelmzésként beállítás"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Személyes információ"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Teljes név"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "E-mail cím"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Szervezet"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Szerver információ"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "Hírek (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Semmi (helyi)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Ezen a szerveren kötelező az azonosítás"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "Hírszerver"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Szerver a fogadáshoz"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "SMTP szerver (küldés)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "Felhasználói Azonosító"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Jelszó"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 msgid "Use secure authentication (APOP)"
 msgstr "Biztonságos hitelesítés használata (APOP)"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Üzenetek törlése a szerverről fogadás után"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "Eltávolítás utána"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "nap"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 nap: azonnal eltávolítani)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Minden üzenet letöltése a szerverről"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "Fogadott levél méretkorlát"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Üzenetek szűrése fogadás közben"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Alapértelmezett bejövő postafiók"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "A nem szűrt üzenetek ebbe a mappába fognak kerülni."
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "Azonosítási módszer"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "Hírek"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 msgid "Maximum number of articles to download"
 msgstr "A letölteni kívánt maximális cikkek száma"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 msgid "No limit if 0 is specified."
 msgstr "Ha 0 van megadva, akkor korlátlan."
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Fogadás mindről' ellenőrizze ezt a hozzáférést is"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Fejléc"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Dátum fejléc mező hozzáadás"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Üzenet-azonosító generálása"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Felhasználó által definiált fejléc hozzáadása"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " Szerkesztés... "
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Azonosítás"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Azonosítás (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4139,177 +4139,190 @@ msgstr ""
 "Ha ezeket a mezőket üresen hagyja, a levelek fogadásához használt "
 "felhasználói azonosító és jelszó lesz használva."
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Azonosítás küldés előtt POP3-mal"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 msgid "Command output"
 msgstr "Parancskimenet"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Az alábbi címek automatikus beállítása"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Másolat"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Titkos másolat"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Válaszcím"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Üzenetet mindig írja alá digitálisan"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "Üzenetet mindig titkosítsa"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr "Titkosítás, ha titkosított üzenetre válaszol"
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "ASCII-páncélozott formátum használata titkosításhoz"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "Szöveges aláírás használata"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Digitális aláírás kulcs"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Alapértelmezett GnuPG kulcs használata"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Kulcs választása az email címe alapján"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Kulcs kézi megadása"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "Felhasználó vagy kulcs Azonosító:"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "Nem használ SSL-t"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "SSL használata POP3 kapcsolathoz"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "STARTTLS parancs használata SSL kapcsolat indításához"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL használata IMAP4 kapcsolathoz"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "SSL használata NNTP kapcsolathoz"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Küldés (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "SSL használata SMTP kapcsolathoz"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr "Nem-blokkolódó SSL használata"
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Ezt kapcsolja ki, ha az SSL kapcsolattal probléma van."
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "SMTP port megadása"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "POP3 port megadása"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "IMAP4 port megadása"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "NNTP port megadása"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Tartománynév (domain) megadása"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "IMAP szerver könyvtár"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "Elküldött üzenetek elhelyezése"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "Vázlatok elhelyezése"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Törölt üzenetek elhelyezése"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "Törölt üzenetek elhelyezése"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "Hozzáférés név nincs megadva."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "Nincs email cím megadva."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "Nincs megadott SMTP szerver."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "Nincs felhasználói azonosító megadva."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "Nincs megadott POP3 szerver."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "Nincs megadott IMAP4 szerver."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "Nincs megadott NNTP szerver."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5297,7 +5310,7 @@ msgstr "Régi Sylpheed"
 msgid "Custom header setting"
 msgstr "Saját fejléc beállítások"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr " Törlés"
 
@@ -5353,197 +5366,197 @@ msgstr "Megjelenítő fejlécek beállításainak mentése...\n"
 msgid "This header is already in the list."
 msgstr "Ez a fejléc már szerepel a listán."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Szűrő beállítása"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr "Bakapcsolva"
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Tényleg törölni szeretné a(z) '%s' szabályt?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Szabály törlése"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 msgid "Filter rule"
 msgstr "Szűrőszabály"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr "Ha a következő néhány feltétel egyezik"
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr "Ha a következő összes feltétel egyezik"
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr "A következő műveletek teljesítése:"
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr "Címzett vagy másolat"
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 msgid "Any header"
 msgstr "Bármely fejléc"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 msgid "Edit header..."
 msgstr "Fejléc szerkesztése..."
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 msgid "Message body"
 msgstr "Üzenettest"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr "A parancs eredménye"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr "Kor"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "tartalmazza"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 msgid "doesn't contain"
 msgstr "nem tartalmazza"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr "pontosan ez"
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr "nem ez"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr "egyezik ezzel"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr "nem egyezik ezzel"
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr "nagyobb, mint"
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr "kisebb, mint"
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr "régebbi, mint"
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr "fiatalabb, mint"
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 msgid "Move to"
 msgstr "Mozgatás ide"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 msgid "Copy to"
 msgstr "Másolás ide"
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Ne fogadjon"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 msgid "Delete from server"
 msgstr "Törlés a szerverről"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 msgid "Set mark"
 msgstr "Jelölés beállítása"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 msgid "Set color"
 msgstr "Szín beállítása"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 msgid "Mark as read"
 msgstr "Olvasottként megjelöl"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 msgid "Forward as attachment"
 msgstr "Csatolásként továbbít"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 msgid "Redirect"
 msgstr "Átirányít"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 msgid "Execute command"
 msgstr "Parancs futtatása"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr "Szabálykiértékelés leállítása"
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 msgid "folder:"
 msgstr "mappa:"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 msgid "day(s)"
 msgstr "nap"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 msgid "address:"
 msgstr "cím:"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 msgid "Edit header list"
 msgstr "Fejléclista szerkesztése"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 msgid "Headers"
 msgstr "Fejlécek"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 msgid "Header:"
 msgstr "Fejléc:"
 
-#: src/prefs_filter_edit.c:1679
-msgid "Rule name is not specified."
-msgstr "Nincs megadva szabálynév."
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 msgid "Command is not specified."
 msgstr "Nincs mgadva parancs."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr "Érvénytelen feltétel."
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 msgid "Destination folder is not specified."
 msgstr "Nincs megadva célmappa."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+msgid "Rule name is not specified."
+msgstr "Nincs megadva szabálynév."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr "Érvénytelen feltétel."
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr "Érvénytelen művelet."
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 msgid "Condition not exist."
 msgstr "Nem létező feltétel."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 msgid "Action not exist."
 msgstr "Nem létező művelet."
 
@@ -5990,15 +6003,20 @@ msgstr "csak olvasható"
 msgid "unknown"
 msgstr "ismeretlen"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "Nem lehet olvasni a hírcsoportok listáját."
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Nem lehet olvasni a hírcsoportok listáját."
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Kész."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d hírcsoport letöltve (%s olvasott)"
diff --git a/po/it.po b/po/it.po
index 1beafe68..f11485af 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.1.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+0900\n"
 "PO-Revision-Date: 2005-12-01 13:51+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -19,9 +19,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Lettura della configurazione per ogni account...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "la scrittura della configurazione sul file è fallita\n"
@@ -44,176 +44,176 @@ msgstr "creazione della connessione IMAP4 a %s:%d ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "Impossibile avviare la sessione TLS.\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, c-format
 msgid "Getting message %d"
 msgstr "Ricezione del messaggio %d"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Aggiunta di messaggi in %s (%d / %d)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Spostamento dei messaggi da %s in %s ..."
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copia dei messaggi da %s in %s ..."
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, c-format
 msgid "Removing messages %s"
 msgstr "Rimozione messaggi %s"
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "impossibile impostare i flag eliminati: %s\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "impossibile cancellare\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Rimozione di tutti i messaggi in %s"
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 msgid "can't set deleted flags: 1:*\n"
 msgstr "impossibile impostare i flag eliminati: 1:*\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 msgid "can't close folder\n"
 msgstr "impossibile chiudere la cartella\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "la cartella radice %s non esiste\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 msgid "error occurred while getting LIST.\n"
 msgstr "si è verificato un errore durante la ricezione di LIST.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Impossibile creare «%s»\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Impossibile creare «%s» sotto IN ENTRATA\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "impossibile creare la casella postale: LIST fallito\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "impossibile creare la casella postale\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "impossibile rinominare la casella postale: %s in %s\n"
 
-#: libsylph/imap.c:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "impossibile eliminare la casella postale\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "impossibile ricevere la busta\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Ricezione intestazioni del messaggio (%d / %d)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "si è verificato un errore durante la ricezione della busta.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "impossibile analizzare la busta: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossibile connettersi al server IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2475
+#: libsylph/imap.c:2487
 #, 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:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "impossibile ricevere il namespace\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "impossibile selezionare la cartella: %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 msgid "error on imap command: STATUS\n"
 msgstr "errore durante il comando imap: STATUS\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autenticazione IMAP4 fallita.\n"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "Login IMAP4 fallito.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "impossibile aggiungere %s a %s\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(spedizione del file...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "impossibile aggiungere a %s\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "impossibile copiare %s in %s\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "errore durante il comando imap: STORE %s %s\n"
 
-#: libsylph/imap.c:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "errore durante il comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 msgid "error while imap command: CLOSE\n"
 msgstr "errore durante il comando imap: CLOSE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv non può convertire UTF-7 in %s\n"
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non può convertire %s in UTF-7\n"
@@ -300,30 +300,30 @@ msgstr "impossibile troncare a zero la casella postale.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Esportazione dei messaggi da %s in %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "impossibile copiare il messaggio %s in %s\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "impossibile aprire il file delle segnature.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "la cartella sorgente é identica a quella di destinazione.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copia del messaggio %s%c%d in %s ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Ultimo numero nella cartella %s = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -332,7 +332,7 @@ msgstr ""
 "Il file «%s» esiste già.\n"
 "Impossibile creare la cartella."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -361,71 +361,71 @@ msgstr "Creazione della connessione NNTP con %s:%d ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "La connessione NNTP a %s:%d è stata interrotta. Riconnessione...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "l'articolo %d è già nella cache.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "ricezione dell'articolo %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "impossibile leggere l'articolo %d\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "impossibile recuperare la lista dei newsgroup\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "impossibile inviare l'articolo.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "impossibile recuperare l'articolo %d\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "impossibile selezionare il gruppo: %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "intervallo di articoli non valido: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "non ci sono nuovi articoli.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "ricezione di xover %d - %d in %s...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "impossibile ricevere xover\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "si è verificato un errore durante la ricezione di xover.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "riga xover non valida: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "impossibile ricevere xhdr\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "si è verificato un errore durante la ricezione di xhdr.\n"
 
@@ -519,16 +519,16 @@ msgstr "Filtro mail spazzatura"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Conversione del codice fallita.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "Impossibile aprire il file delle segnature\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "impossibile prelevare il messaggio %d\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La riga di comando di stampa non è valida: «%s»\n"
@@ -720,12 +720,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Nome"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Protocollo"
 
@@ -733,7 +733,7 @@ msgstr "Protocollo"
 msgid "Server"
 msgstr "Server"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr " Modifica "
 
@@ -746,7 +746,7 @@ msgstr " _Imposta come account predefinito "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Eliminare l'account «%s»?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 msgid "(Untitled)"
 msgstr "(Senza titolo)"
 
@@ -997,7 +997,7 @@ msgstr "Indirizzo e-mail"
 msgid "Address book"
 msgstr "Rubrica"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Nome:"
 
@@ -1012,7 +1012,7 @@ msgstr "Elimina"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr " Aggiungi "
 
@@ -1185,7 +1185,7 @@ msgid "Group"
 msgstr "Gruppo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Cartella"
 
@@ -1707,12 +1707,12 @@ msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Invia"
@@ -1754,7 +1754,7 @@ msgid "Attach file"
 msgstr "Allega il file"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Firma"
@@ -1961,7 +1961,7 @@ msgid " Check File "
 msgstr " Controllo file "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "File"
 
@@ -2040,7 +2040,7 @@ msgid "Edit JPilot Entry"
 msgstr "Modifica la voce JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2105,7 +2105,7 @@ msgstr "Timeout (secondi)"
 msgid "Maximum Entries"
 msgstr "Numero massimo di voci"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Essenziale"
 
@@ -2163,7 +2163,7 @@ msgid "Exporting file:"
 msgstr "File su cui esportare:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr " Seleziona... "
 
@@ -3622,7 +3622,7 @@ msgstr "Include la nuova posta di tutti gli account"
 msgid "Send queued message(s)"
 msgstr "Invia i messaggi accodati"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Componi"
@@ -3647,7 +3647,7 @@ msgstr "Rispondi tutti"
 msgid "Reply to all"
 msgstr "Risponde a tutti"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Inoltra"
 
@@ -3926,214 +3926,214 @@ msgstr ""
 "Passphrase sbagliata! Provare ancora...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Apertura della finestra delle preferenze degli account...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Preferenze per il nuovo account"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Preferenze dell'account"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Creazione della finestra delle preferenze degli account...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Ricevi"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Avanzato"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Nome di questo account"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "Imposta come predefinito"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Informazioni personali"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Nome completo"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "Indirizzo di posta"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Informazioni sui server"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
 # src/prefs_account.c:634 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Nessuno (locale)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Questo server richiede l'autenticazione"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "Server delle news"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Server per la ricezione"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "Server SMTP (spedisce)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "User ID"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Password"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 msgid "Use secure authentication (APOP)"
 msgstr "Usa l'autenticazione sicura (APOP)"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Rimuovi i messaggi sul server dopo averli ricevuti"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "Rimuovi dopo "
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr " giorni"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 giorni: rimuovi immediatamente)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Scarica tutti i messaggi sul server"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "Limite della dimensione da ricevere di"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Filtra i messaggi in ricezione"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Inbox predefinita"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "I messaggi non filtrati saranno memorizzati in questa cartella."
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "Metodo di autenticazione"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Automatico"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 msgid "Maximum number of articles to download"
 msgstr "Numero massimo di articoli da scaricare"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 msgid "No limit if 0 is specified."
 msgstr "Nessun limite se viene specificato 0."
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "«Ricevi tutti» controlla i nuovi messaggi su questo account"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Intestazione"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Aggiungi il campo Data nell'intestazione"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Genera ID messaggio"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Aggiungi un'intestazione definita dall'utente"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " Modifica... "
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticazione SMTP (SMTP AUT)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4141,177 +4141,190 @@ msgstr ""
 "Lasciando vuote queste voci verranno usate la stessa user ID e password "
 "della ricezione."
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentica con POP3 prima dell'invio"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 msgid "Command output"
 msgstr "Output del comando"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Imposta automaticamente i seguenti indirizzi"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Rispondi a"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Firma il messaggio per predefinizione"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "Cifra il messaggio per predefinizione"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr "Cifra quando rispondi a un messaggio cifrato"
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "Usa il formato ASCII-armato per la cifratura"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "Usa la firma con il testo in chiaro"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Chiave della firma"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Usa la chiave predefinita di GnuPG"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Scegli la chiave per il tuo indirizzo email"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Specifica la chiave manualmente"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "ID user o chiave:"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "Non usare SSL"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "Usa SSL per la connessione POP3"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usa il comando STARTTLS per iniziare la sessione SSL"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usa SSL per la connessione IMAP4"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "Usa SSL per la connessione NNTP"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Invio (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "Usa SSL per la connessione SMTP"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr "Usa SSL non bloccato"
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Disattivare se si hanno problemi nella connessione SSL."
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "Specifica la porta SMTP"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "Specifica la porta POP3"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "Specifica la porta IMAP4"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "Specifica la porta NNTP"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Specifica il nome di dominio"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "Directory del server IMAP4"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "Metti i messaggi spediti in"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "Metti i messaggi abbozzati in"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Metti i messaggi eliminati in"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "Metti i messaggi eliminati in"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "Non è stato immesso il nome dell'account."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "Non è stato immesso l'indirizzo di posta."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "Non è stato immesso il server SMTP."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "Non è stato immesso lo user ID."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "Non è stato immesso il server POP3."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "Non è stato immesso il server IMAP4."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "Non è stato immesso il server NNTP."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5293,7 +5306,7 @@ msgstr "Vecchio sylpheed"
 msgid "Custom header setting"
 msgstr "Impostazione dell'intestazione personalizzata"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr " Elimina "
 
@@ -5349,197 +5362,197 @@ msgstr "Scrittura della configurazione delle intestazioni visualizzate...\n"
 msgid "This header is already in the list."
 msgstr "Questa intestazione è già nella lista."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Impostazione dei filtri"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Eliminare la regola «%s»?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Elimina la regola"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 msgid "Filter rule"
 msgstr "Regola del filtro"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr "Se qualcuna delle seguenti condizioni corrisponde"
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr "Se tutte le seguenti condizioni corrispondono"
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr "Eseguire le seguenti azioni:"
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr "A o Cc"
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 msgid "Any header"
 msgstr "Qualsiasi intestazione"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 msgid "Edit header..."
 msgstr "Modifica intestazione..."
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 msgid "Message body"
 msgstr "Corpo messaggio"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr "Risultato del comando"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr "Età"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "contiene"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 msgid "doesn't contain"
 msgstr "non contiene"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr "è"
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr "non è"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr "corrisponde alla esp.reg."
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr "non corrisponde alla esp. reg."
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr "è più grande di"
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr "è più piccolo di"
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr "è più lungo di"
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr "è più corto di"
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 msgid "Move to"
 msgstr "Sposta in"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 msgid "Copy to"
 msgstr "Copia in"
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Non ricevere"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 msgid "Delete from server"
 msgstr "Elimina dal server"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 msgid "Set mark"
 msgstr "Imposta segno"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 msgid "Set color"
 msgstr "Imposta colore"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 msgid "Mark as read"
 msgstr "Segna come letto"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 msgid "Forward as attachment"
 msgstr "Inoltra come allegato"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 msgid "Redirect"
 msgstr "Rispedisci"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 msgid "Execute command"
 msgstr "Esegui comando"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr "Ferma valutazione regola"
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 msgid "folder:"
 msgstr "cartella:"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 msgid "day(s)"
 msgstr "giorno(i)"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 msgid "address:"
 msgstr "indirizzo:"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 msgid "Edit header list"
 msgstr "Modifica lista intestazione"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 msgid "Headers"
 msgstr "Intestazioni"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 msgid "Header:"
 msgstr "Intestazione:"
 
-#: src/prefs_filter_edit.c:1679
-msgid "Rule name is not specified."
-msgstr "Il nome della regola non è specificato."
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 msgid "Command is not specified."
 msgstr "Il comando non è specificato."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr "Esiste una condizione non valida."
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 msgid "Destination folder is not specified."
 msgstr "La cartella di destinazione non è specificata."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+msgid "Rule name is not specified."
+msgstr "Il nome della regola non è specificato."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr "Esiste una condizione non valida."
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr "Esiste un'azione non valida."
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 msgid "Condition not exist."
 msgstr "La condizione non esiste."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 msgid "Action not exist."
 msgstr "L'azione non esiste."
 
@@ -5984,15 +5997,20 @@ msgstr "sola lettura"
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "Impossibile recuperare la lista dei newsgroup."
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Impossibile recuperare la lista dei newsgroup."
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Fatto."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "ricevuti %d newsgroup (%s letti)"
diff --git a/po/ja.po b/po/ja.po
index a16bf4a0..7e37d8ae 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+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,9 +18,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "すべてのアカウント毎の設定を読み込み中...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "設定のファイルへの書き込みに失敗しました\n"
@@ -43,176 +43,176 @@ msgstr "%s:%d へのIMAP4の接続を確立中...\n"
 msgid "Can't start TLS session.\n"
 msgstr "TLS セッションを開始できません。\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, c-format
 msgid "Getting message %d"
 msgstr "メッセージ %d を取得中"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "メッセージを %s に追加しています (%d / %d)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "メッセージ %s を %s に移動しています..."
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "メッセージ %s を %s にコピーしています..."
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, c-format
 msgid "Removing messages %s"
 msgstr "メッセージ %s を削除しています"
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "deleted フラグをセットできません: %s\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "expunge できません\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "%s のすべてのメッセージを削除しています"
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 msgid "can't set deleted flags: 1:*\n"
 msgstr "deleted フラグをセットできません: 1:*\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 msgid "can't close folder\n"
 msgstr "フォルダをクローズできません\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "ルートフォルダ %s が存在しません\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 msgid "error occurred while getting LIST.\n"
 msgstr "LIST の取得中にエラーが発生しました。\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "'%s' を作成できません。\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "INBOX の下に '%s' を作成できません。\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "メールボックスを作成できません: LIST に失敗\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "メールボックスを作成できません\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "メールボックスを名称変更できません: %s -> %s\n"
 
-#: libsylph/imap.c:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "メールボックスを削除できません\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "エンベロープを取得できません\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "メッセージのヘッダを取得中 (%d / %d)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "エンベロープを取得中にエラーが発生しました。\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "エンベロープを解析できません: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4 サーバ: %s:%d に接続できません\n"
 
-#: libsylph/imap.c:2475
+#: libsylph/imap.c:2487
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "%s:%d との IMAP4 セッションを確立できません\n"
 
-#: libsylph/imap.c:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "namespace を取得できません\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "フォルダ %s を選択できません\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 msgid "error on imap command: STATUS\n"
 msgstr "imap コマンド中のエラー: STATUS\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 の認証に失敗しました。\n"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4のログインに失敗しました。\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s を %s に追加できません\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(ファイルを送信中...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "メッセージを %s に追加できません\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s を %s にコピーできません\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap コマンド中のエラー: STORE %s %s\n"
 
-#: libsylph/imap.c:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap コマンド中のエラー: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 msgid "error while imap command: CLOSE\n"
 msgstr "imap コマンド中のエラー: CLOSE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv が UTF-7 を %s に変換できません\n"
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv が %s を UTF-7 に変換できません\n"
@@ -299,30 +299,30 @@ msgstr "メールボックスをゼロに切り詰められません。\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "メッセージを %s から %s に書き出しています...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "メッセージ %s を %s にコピーできません\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "マークファイルを開けません。\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "移動元フォルダが移動先と同一です。\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "メッセージ %s%c%d を %s にコピーしています...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "ディレクトリ %s 内の最後の番号 = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -331,7 +331,7 @@ msgstr ""
 "ファイル `%s' がすでに存在します。\n"
 "フォルダを作成できません。"
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -360,71 +360,71 @@ msgstr "%s:%d への NNTP の接続を確立中...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "%s:%d への NNTP の接続が切れています。再接続します...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "%d 番の記事はすでにキャッシュされています。\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "%d 番の記事を取得しています...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "%d 番の記事を読めません\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "ニュースグループリストを取得できません\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "記事をポストできません。\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "%d 番の記事を取得できません\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "グループを選択できません: %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "無効な記事の範囲です: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "新着記事はありません。\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "xover %d - %d を取得中 (%s)...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "xover 情報を取得できません\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "xover 情報を取得中にエラーが発生しました。\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "無効な xover 行です: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "xhdr 情報を取得できません\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "xhdr 情報を取得中にエラーが発生しました。\n"
 
@@ -518,16 +518,16 @@ msgstr "迷惑メールフィルタ"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): コード変換に失敗しました。\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "マークファイルを開けません\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "メッセージ %d を取り込めません\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "印刷のコマンドラインが無効です: `%s'\n"
@@ -717,12 +717,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "名前"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "プロトコル"
 
@@ -730,7 +730,7 @@ msgstr "プロトコル"
 msgid "Server"
 msgstr "サーバ"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "編集"
 
@@ -743,7 +743,7 @@ msgstr " 通常使用するアカウントに指定(_S) "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "本当にアカウント '%s' を削除してもいいですか?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 msgid "(Untitled)"
 msgstr "(名称未設定)"
 
@@ -994,7 +994,7 @@ msgstr "電子メール アドレス"
 msgid "Address book"
 msgstr "アドレス帳"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "名前:"
 
@@ -1009,7 +1009,7 @@ msgstr "削除"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "追加"
 
@@ -1179,7 +1179,7 @@ msgid "Group"
 msgstr "グループ"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "フォルダ"
 
@@ -1697,12 +1697,12 @@ msgid "MIME type"
 msgstr "MIME タイプ"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "サイズ"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "送信"
@@ -1744,7 +1744,7 @@ msgid "Attach file"
 msgstr "ファイルを添付"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "署名"
@@ -1951,7 +1951,7 @@ msgid " Check File "
 msgstr " ファイルをチェック "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "ファイル"
 
@@ -2029,7 +2029,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilotエントリを編集"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2094,7 +2094,7 @@ msgstr "タイムアウト(秒)"
 msgid "Maximum Entries"
 msgstr "最大エントリ数"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "基本"
 
@@ -2151,7 +2151,7 @@ msgid "Exporting file:"
 msgstr "エクスポートファイル:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr " 選択... "
 
@@ -3605,7 +3605,7 @@ msgstr "全アカウントの新着メールの取込"
 msgid "Send queued message(s)"
 msgstr "送信待機中のメッセージを送信する"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "作成"
@@ -3630,7 +3630,7 @@ msgstr "全員に返信"
 msgid "Reply to all"
 msgstr "全員に返信"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "転送"
 
@@ -3909,390 +3909,402 @@ msgstr ""
 "不正なパスフレーズです! 再入力して下さい...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "アカウントプリファレンスウィンドウを開いています...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "新規アカウントの設定"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "アカウントの設定"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "アカウントプリファレンスウィンドウを作成中...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "受信"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "個人情報"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "高度な設定"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "このアカウントの名称"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "通常使用"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "個人情報"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "名前"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "メールアドレス"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "組織"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "サーバ情報"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "ニュース (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "なし (ローカル)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "このサーバは認証が必要"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "ニュースサーバ"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "受信用サーバ"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "SMTPサーバ (送信)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "ユーザID"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "パスワード"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 msgid "Use secure authentication (APOP)"
 msgstr "安全な認証方式を使用する (APOP)"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "受信時にサーバ上のメッセージを削除する"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "メッセージを"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "日後に削除"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0日: 即座に削除)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "サーバ上のすべてのメッセージを受信する"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "受信サイズ制限"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "受信時にメッセージを振り分ける"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "標準の受信箱"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "振り分けられなかったメッセージはこのフォルダに格納されます。"
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "認証方式"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "自動"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "ニュース"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 msgid "Maximum number of articles to download"
 msgstr "ダウンロードする記事数の上限"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 msgid "No limit if 0 is specified."
 msgstr "0を指定すると無制限になります。"
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "「全受信」でこのアカウントの新着メッセージをチェックする"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "ヘッダ"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Dateヘッダフィールドを付ける"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "メッセージIDを生成する"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "ユーザ定義のヘッダを追加する"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " 編集... "
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "認証"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP認証 (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
 "このエントリが空のときは、受信時と同じユーザIDとパスワードが使用されます。"
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "送信前にPOP3認証を行う"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 msgid "Command output"
 msgstr "コマンドの出力"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "以下のアドレスを自動指定"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "標準でメッセージに署名する"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "標準でメッセージを暗号化する"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr "暗号化されたメッセージに返信した場合は暗号化する"
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "暗号化にASCII包装形式を使用する"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "クリアテキスト署名を使用する"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "署名鍵"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "標準のGnuPG鍵を使用する"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "自分の電子メールアドレスで鍵を選択する"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "鍵を手動で指定する"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "ユーザまたは鍵ID:"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "SSLを使用しない"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "POP3の接続にSSLを使用"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "SSLセッションの開始にSTARTTLSコマンドを使用"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "IMAP4の接続にSSLを使用"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "NNTPの接続にSSLを使用"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "送信 (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "SMTPの接続にSSLを使用"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr "非ブロッキングSSLを使用する"
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "SSLの接続に問題が生じる場合はオフにしてください。"
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "SMTPポートを指定"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "POP3ポートを指定"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "IMAP4ポートを指定"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "NNTPポートを指定"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "ドメイン名を指定"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "IMAPサーバディレクトリ"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr "このディレクトリのサブフォルダのみが表示されます。"
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "送信控フォルダの場所"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "草稿フォルダの場所"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+msgid "Put queued messages in"
+msgstr "送信待ちフォルダの場所"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "ごみ箱フォルダの場所"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "アカウント名が入力されていません。"
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "メールアドレスが入力されていません。"
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "SMTPサーバが入力されていません。"
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "ユーザIDが入力されていません。"
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "POP3サーバが入力されていません。"
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4サーバが入力されていません。"
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "NNTPサーバが入力されていません。"
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr "指定したフォルダは送信待ちフォルダではありません。"
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5265,7 +5277,7 @@ msgstr "旧Sylpheed"
 msgid "Custom header setting"
 msgstr "カスタムヘッダの設定"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr "  削除  "
 
@@ -5321,197 +5333,197 @@ msgstr "表示ヘッダの設定を書き出し中...\n"
 msgid "This header is already in the list."
 msgstr "このヘッダはすでにリスト中に存在します。"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "振り分けの設定"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr "有効"
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "本当にルール '%s' を削除してもいいですか?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "ルールの削除"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 msgid "Filter rule"
 msgstr "フィルタルール"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr "次の条件のいずれかが該当する場合"
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr "次の条件のすべてが該当する場合"
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr "次のアクションを実行:"
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr "To または Cc"
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 msgid "Any header"
 msgstr "いずれかのヘッダ"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 msgid "Edit header..."
 msgstr "ヘッダを編集..."
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 msgid "Message body"
 msgstr "メッセージ本文"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr "コマンドの実行結果"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr "経過日数"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "が次を含む"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 msgid "doesn't contain"
 msgstr "が次を含まない"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr "が次に一致"
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr "が次に一致しない"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr "が次の正規表現にマッチ"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr "が次の正規表現にマッチしない"
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr "が次より大きい"
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr "が次より小さい"
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr "が次より長い"
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr "が次より短い"
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 msgid "Move to"
 msgstr "移動"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 msgid "Copy to"
 msgstr "コピー"
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "受信しない"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 msgid "Delete from server"
 msgstr "サーバから削除"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 msgid "Set mark"
 msgstr "マーク"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 msgid "Set color"
 msgstr "カラーラベルを指定"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 msgid "Mark as read"
 msgstr "読んだことにする"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 msgid "Forward as attachment"
 msgstr "添付として転送"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 msgid "Redirect"
 msgstr "手を加えずに転送"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 msgid "Execute command"
 msgstr "コマンドを実行"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr "ルールの評価を停止"
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 msgid "folder:"
 msgstr "フォルダ:"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 msgid "day(s)"
 msgstr "日"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 msgid "address:"
 msgstr "アドレス:"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 msgid "Edit header list"
 msgstr "ヘッダリストの編集"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 msgid "Headers"
 msgstr "ヘッダ"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 msgid "Header:"
 msgstr "ヘッダ:"
 
-#: src/prefs_filter_edit.c:1679
-msgid "Rule name is not specified."
-msgstr "ルール名が指定されていません。"
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 msgid "Command is not specified."
 msgstr "コマンドが指定されていません。"
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr "無効な条件が存在します。"
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 msgid "Destination folder is not specified."
 msgstr "移動先のフォルダが指定されていません。"
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+msgid "Rule name is not specified."
+msgstr "ルール名が指定されていません。"
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr "無効な条件が存在します。"
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr "無効なアクションが存在します。"
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 msgid "Condition not exist."
 msgstr "条件が存在しません。"
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 msgid "Action not exist."
 msgstr "アクションが存在しません。"
 
@@ -5955,15 +5967,19 @@ msgstr "購読のみ"
 msgid "unknown"
 msgstr "不明"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+msgid "Getting newsgroup list..."
+msgstr "ニュースグループリストを取得中..."
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "ニュースグループリストを取得できません。"
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "完了."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d ニュースグループを受信 (%s 受信)"
diff --git a/po/ko.po b/po/ko.po
index 3ae1a91c..e2601f6c 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed  0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+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,9 +18,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "각 계정에대한 모든 설정을 읽습니다...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "파일에 설정을 쓰기가 실패했습니다\n"
@@ -44,182 +44,182 @@ msgstr "%s:%d에대한 IMAP4 접속을 만듭니다 ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "TLS 세션을 시작할 수 없습니다.\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "%d 메시지를 삭제하는 중"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "메시지를 보내는 중 (%d / %d 바이트)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "메시지 %s%c%d를 %s로 이동합니다...\n"
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "메시지 %s%c%d를 %s로 복사중입니다 ...\n"
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "삭제 플래그를 설정할 수가 없습니다: %d\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "지울 수가 없습니다\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "삭제 플래그를 설정할 수가 없습니다: 1:%d\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "폴더를 선택할 수가 없습니다: %s\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "표시 파일이 발견되지않음.\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "LIST를 얻는 도중 에러가 발생.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "'%s'를 생성할 수가 없습니다\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "INBOX 아래에 '%s'를 생성할 수가 없습니다\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "우편함을 생성할 수 없습니다: LIST 실패\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "우편함을 생성할 수 없습니다\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "우편함명을 바꿀 수 없습니다: %s에서 %s로\n"
 
-#: libsylph/imap.c:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "우편함을 삭제할 수 없습니다\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "envelope를 얻을 수가 없습니다\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "메시지를 보내는 중 (%d / %d 바이트)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "envelope를 얻는 중 에러 발생.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "envelope를 파싱할 수가 없습니다: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "%s:%d IMAP4 서버에 연결할 수가 없습니다\n"
 
-#: libsylph/imap.c:2475
+#: libsylph/imap.c:2487
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "IMAP4 세션을 만들 수 없습니다: %s: %d\n"
 
-#: libsylph/imap.c:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "namespace를 얻을 수 없습니다\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "폴더를 선택할 수가 없습니다: %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "인증 방법"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 로그인을 실패했습니다.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s를 %s에 붙일 수 없습니다\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(파일을 보냅니다...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "%s 메시지를 추가할 수가 없습니다\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%d를 %s로 복사할 수가 없습니다\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap 명령어 실행중 에러: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv가 UTF-7를 %s로 변환할 수 없습니다\n"
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv가 %s를 UTF-7로 변환할 수 없습니다\n"
@@ -306,30 +306,30 @@ msgstr "메일박스의 크기를 0으로 만들수가 없습니다.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "메시지를 %s에서 %s로 보냅니다...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "메시지 %s을 %s로 복사할 수가 없습니다\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "표시 파일을 열 수가 없습니다.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "옮길 폴더와 옮겨질 폴더가 같습니다.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "메시지 %s%c%d를 %s로 복사중입니다 ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "디렉토리 %s에서 마지막 숫자 = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -338,7 +338,7 @@ msgstr ""
 "파일 `%s'가 이미 존재합니다.\n"
 "폴더를 생성할 수가 없습니다."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -360,71 +360,71 @@ msgstr "%s:%d로 NNTP 접속을 생성합니다...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "%s:%d로의 NNTP 연결이 끊어졌습니다. 다시 연결합니다...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "기사 %d는 이미 캐쉬되었습니다.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "기사 %d를 얻습니다...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "기사 %d를 읽을 수가 없습니다\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "뉴스그룹 목록을 받을 수가 없습니다\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "기사를 올릴 수가 없습니다.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "기사 %d를 가져올 수가 없습니다\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "%s 그룹을 선택할 수가 없습니다\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "올바르지않은 기사 범위: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "새 기사가 없습니다.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "%3$s에서 %1$d - %2$d xover를 가져옴...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "xover를 가져올 수가 없습니다\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "xover를 얻는 도중 에러가 발생.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "올바르지않은 xover line: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "xhdr을 가져올 수가 없습니다\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "xhdr을 얻는 도중 에러가 발생.\n"
 
@@ -522,16 +522,16 @@ msgstr "폴더"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): 코드 변환이 실패했습니다.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "표시 파일을 열수가 없습니다\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "메시지 %d를 가져올 수가 없습니다\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "인쇄 명령어가 올바르지않습니다: `%s'\n"
@@ -709,12 +709,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "이름"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "프로토콜"
 
@@ -722,7 +722,7 @@ msgstr "프로토콜"
 msgid "Server"
 msgstr "서버"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "편집"
 
@@ -736,7 +736,7 @@ msgstr " 기본 계정으로 설정 "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "정말로 이 계정을 삭제하시겠습니까?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 #, fuzzy
 msgid "(Untitled)"
 msgstr "제목 없슴"
@@ -986,7 +986,7 @@ msgstr "이메일 주소"
 msgid "Address book"
 msgstr "주소록"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "이름:"
 
@@ -1001,7 +1001,7 @@ msgstr "삭제"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "추가"
 
@@ -1168,7 +1168,7 @@ msgid "Group"
 msgstr "그룹"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "폴더"
 
@@ -1721,12 +1721,12 @@ msgid "MIME type"
 msgstr "마임 타입"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "메일 발송"
@@ -1768,7 +1768,7 @@ msgid "Attach file"
 msgstr "파일 첨부"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "서명"
@@ -1982,7 +1982,7 @@ msgid " Check File "
 msgstr " 파일 확인 "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "파일"
 
@@ -2060,7 +2060,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot 항목 편집"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2125,7 +2125,7 @@ msgstr ""
 msgid "Maximum Entries"
 msgstr ""
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "기본"
 
@@ -2182,7 +2182,7 @@ msgid "Exporting file:"
 msgstr ""
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr "고르기..."
 
@@ -3666,7 +3666,7 @@ msgstr "모든 계정에서 새 메일을 가져옵니다"
 msgid "Send queued message(s)"
 msgstr "임시 보관된 메시지를 보냅니다"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "작성"
@@ -3691,7 +3691,7 @@ msgstr "전체 회신"
 msgid "Reply to all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "전달"
 
@@ -3972,398 +3972,411 @@ msgstr ""
 "Bad passphrase! 다시 시도하세요...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "계정 설정 창을 엽니다...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "계정%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "새 계정에대한 설정"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "계정 기본 설정"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "계정 설정 창을 생성합니다...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "받기"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "프라이버시"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "고급"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "이 계정의 이름"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "기본 계정으로 설정"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "신상 정보"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "정식 이름"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "메일 주소"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "기관"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "서버 정보"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "뉴스(NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "로컬"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "이 서버는 인증을 필요로 합니다"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "뉴스 서버"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "받는 서버"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "SMTP 서버(발송용)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "사용자 계정"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "암호"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "이 서버는 인증을 필요로 합니다"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "받은 후 서버에서 메시지를 지움"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 #, fuzzy
 msgid "Remove after"
 msgstr "폴더 이름 변경"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 #, fuzzy
 msgid "days"
 msgstr "항상"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 일: 즉시 삭제)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "서버에서 모든 메시지를 받음"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "받을 크기 한도"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "받을때 메시지를 필터링"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "기본 우편함"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(필터링 되지 않은 메시지는 이 폴더에 저장될 것입니다)"
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "인증 방법"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "자동"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "뉴스"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "내려받을 최대 기사 수\n"
 "(0인 경우 제한 없음)"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "받는 사람이 지정되지않았습니다"
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "헤더"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Date 헤더 항목을 추가"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Message-ID 생성"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "사용자 정의된 헤더 추가"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " 편집..."
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "인증"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP 인증(SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "보내기전 POP3와 인증"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 #, fuzzy
 msgid "Command output"
 msgstr "명령어"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "다음 주소를 자동적으로 정함"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "참조"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "숨은 참조"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "회신주소"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "기본으로 메시지에 사인을 함"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "기본으로 메시지를 암호화"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "순수한 텍스트 서명 사용"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "기본 GnuPG 키 사용"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "당신의 전자우편 주소로 키 선택"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "수동으로 키 지정"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "사용자 혹은 키 ID:"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "SSL을 사용하지 않습니다"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "POP3 연결에 SSL을 사용합니다"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "SSL 세션을 시작하기 위해 STARTTLS 명령을 사용합니다"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "IMAP4 연결에 SSL을 사용합니다"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "NNTP 연결에 SSL을 사용합니다"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "SMTP 연결에 SSL을 사용합니다"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "SMTP 포트 번호"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "POP3 포트 번호"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "IMAP4 포트 지정"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "NNTP 포트 지정"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "도메인 이름 지정"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "IMAP 서버 디렉토리"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "보낸 메시지 저장"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "임시 메시지 저장"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "삭제된 메시지 저장"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "삭제된 메시지 저장"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "계정 이름이 입력되지 않았습니다."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "메일 주소가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "SMTP 서버가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "사용자 아이디가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "POP3 서버가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 서버가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "NNTP 서버가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5342,7 +5355,7 @@ msgstr "예전 Sylpheed"
 msgid "Custom header setting"
 msgstr "사용자 헤더 설정"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr "삭제"
 
@@ -5398,220 +5411,220 @@ msgstr "표시될 헤더 설정을 씁니다...\n"
 msgid "This header is already in the list."
 msgstr "이 헤더는 목록에 이미 있습니다."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "거르개 설정"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "정말로 이 규칙을 삭제하시겠습니까?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "규칙 삭제"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 #, fuzzy
 msgid "Filter rule"
 msgstr "규칙 삭제"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 #, fuzzy
 msgid "Any header"
 msgstr "숨길 헤더"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 #, fuzzy
 msgid "Edit header..."
 msgstr "헤더"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 #, fuzzy
 msgid "Message body"
 msgstr "본문"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "포함"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 #, fuzzy
 msgid "doesn't contain"
 msgstr "포함 안됨"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 #, fuzzy
 msgid "Move to"
 msgstr "아래로 이동"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 #, fuzzy
 msgid "Copy to"
 msgstr "/복사(_C)..."
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "받지 않음"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 #, fuzzy
 msgid "Delete from server"
 msgstr "폴더 삭제"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 #, fuzzy
 msgid "Set mark"
 msgstr "메모"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 #, fuzzy
 msgid "Set color"
 msgstr "메시지 색 설정"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 #, fuzzy
 msgid "Mark as read"
 msgstr "/표시(_M)/읽은 것으로 표시(_d)"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/첨부로 전달(_w)"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 #, fuzzy
 msgid "Redirect"
 msgstr "/Redirec_t"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 #, fuzzy
 msgid "Execute command"
 msgstr "실행"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 #, fuzzy
 msgid "folder:"
 msgstr "폴더"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 msgid "day(s)"
 msgstr ""
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 #, fuzzy
 msgid "address:"
 msgstr "주소"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 #, fuzzy
 msgid "Edit header list"
 msgstr "헤더"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 #, fuzzy
 msgid "Headers"
 msgstr "헤더"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 #, fuzzy
 msgid "Header:"
 msgstr "헤더"
 
-#: src/prefs_filter_edit.c:1679
-#, fuzzy
-msgid "Rule name is not specified."
-msgstr "받는 사람이 지정되지않았습니다"
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 #, fuzzy
 msgid "Command is not specified."
 msgstr "명령이 지정되지않음"
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "저장 폴더가 설정이 되어있지않습니다"
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+#, fuzzy
+msgid "Rule name is not specified."
+msgstr "받는 사람이 지정되지않았습니다"
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 #, fuzzy
 msgid "Condition not exist."
 msgstr "명령이 지정되지않음"
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: 파일이 없습니다\n"
@@ -6054,15 +6067,20 @@ msgstr "읽기전용"
 msgid "unknown"
 msgstr ""
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "뉴스그룹 목록을 얻을 수가 없습니다."
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "뉴스그룹 목록을 얻을 수가 없습니다."
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "완료."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 74b38804..8902458b 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+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,9 +18,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Skaitoma kiekvienos sąskaitos konfigūracija...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "nepavyko įrašyti į bylą\n"
@@ -43,177 +43,177 @@ msgstr "sukuriamas IMAP4 prisijungimas prie %s:%d ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "Negaliu sukurti TLS sesijos.\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Trinama žinutė %d"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Siunčiu laišką (%d / %d baitai)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Kopijuoju žinutę %s%c%d į %s ...\n"
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopijuoju žinutę %s%c%d į %s ...\n"
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Gaunamos žinutės iš %s..."
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "negaliu nustatyti ištrynimo žymų: %s\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "negaliu išbraukti\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Gaunamos žinutės iš %s..."
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 msgid "can't set deleted flags: 1:*\n"
 msgstr "negaliu nustatyti ištrynimo žymų: 1:*\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 msgid "can't close folder\n"
 msgstr "negaliu uždaryti katalogo\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "šakninis katalogas %s neegzistuoja\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 msgid "error occurred while getting LIST.\n"
 msgstr "klaida gaunant LIST.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Negaliu sukurti „%s“\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "negaliu sukurti „%s“ po INBOX\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "negaliu sukurti dėžutės: nepavyko LIST\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "negaliu sukurti dėžutės\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "negaliu pervadinti dėžutės: %s į %s\n"
 
-#: libsylph/imap.c:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "negaliu ištrinti dėžutės\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "nagaliu gauti voko\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Siunčiu laišką (%d / %d baitai)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "klaida gaunant voką.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "negaliu išanalizuoti voko: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Negaliu prisijungti prie IMAP4 serverio: %s:%d\n"
 
-#: libsylph/imap.c:2475
+#: libsylph/imap.c:2487
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Negaliu sukurti IMAP4 sesijos su: %s:%d\n"
 
-#: libsylph/imap.c:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "negalių gauti vardų zonos\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "negaliu pasirinkti katalogo: %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "klaida vykdant imap komandą: CLOSE\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 autentiškumo tikrinimas nepavyko.\n"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "nepavyko prisijungti prie IMAP4\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "negaliu prirašyti %s į %s\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(siunčiama byla...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "negaliu prirašyti žinutės į %s\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "negaliu nukopijuoti %s į %s\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "klaida vykdant imap komandą: STORE %s %s\n"
 
-#: libsylph/imap.c:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "klaida vykdant imap komandą: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 msgid "error while imap command: CLOSE\n"
 msgstr "klaida vykdant imap komandą: CLOSE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv negali konvertuoti UTF-7 į %s\n"
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv negali konvertuoti %s į UTF-7\n"
@@ -300,30 +300,30 @@ msgstr "negaliu sumažinti dėžutės iki nulio.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Eksportuojamos žinutės iš %s į %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "negaliu nukopijuoti žinutės %s į %s\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "Negaliu atidaryti žymų bylos.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "pradinis katalogas identiškas paskirties katalogui.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopijuoju žinutę %s%c%d į %s ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Paskutinis numeris kataloge %s - %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -332,7 +332,7 @@ msgstr ""
 "Byla „%s“ jau egzistuoja.\n"
 "Negaliu sukurti katalogo."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -361,71 +361,71 @@ msgstr "sukuriu NNTP prisijungimą prie %s:%d ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP prisijungimas prie %s:%d buvo nutrauktas. Jungiuosi iš naujo...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "žinutė %d jau buvo įkelta.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "gaunama žinutė %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "negaliu perskaityti žinutės %d\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "negaliu gauti naujienų grupės sąrašo\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "negaliu paskelbti žinutės.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "negaliu gauti žinutės %d\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "negaliu pažymėti grupės: %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neteisingas žinučių intervalas: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "nėra naujų žinučių.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "gaunamas xover %d - %d, %s...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "negaliu gauti xover\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "klaida gaunant xover.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "bloga xover eilutė: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "negaliu gauti xhdr\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "klaida gaunant xhdr.\n"
 
@@ -519,16 +519,16 @@ msgstr "Nereikalingo pašto filtras"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Nepavyko konvertuoti kodo.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "negali atidaryti žymų bylos\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "negaliu gauti žinutės %d\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Bloga spausdinimo komanda: „%s“\n"
@@ -717,12 +717,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Vardas"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Protokolas"
 
@@ -730,7 +730,7 @@ msgstr "Protokolas"
 msgid "Server"
 msgstr "Serveris"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Taisyti"
 
@@ -743,7 +743,7 @@ msgstr " Pažymėti kaip pagrindinę _sąskaitą "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Ar tikrai norite pašalinti sąskaitą „%s“?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 msgid "(Untitled)"
 msgstr "(Bevardis)"
 
@@ -994,7 +994,7 @@ msgstr "El. pašto adresas"
 msgid "Address book"
 msgstr "Adresų knyga"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Vardas:"
 
@@ -1009,7 +1009,7 @@ msgstr "Ištrinti"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Pridėti"
 
@@ -1176,7 +1176,7 @@ msgid "Group"
 msgstr "Grupė"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Katalogas"
 
@@ -1696,12 +1696,12 @@ msgid "MIME type"
 msgstr "MIME tipas"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Siųsti"
@@ -1743,7 +1743,7 @@ msgid "Attach file"
 msgstr "Prisegti bylą"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Parašas"
@@ -1951,7 +1951,7 @@ msgid " Check File "
 msgstr " Patikrinti bylą "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Byla"
 
@@ -2029,7 +2029,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redaguoti JPilot įrašą"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2094,7 +2094,7 @@ msgstr "Skirtasis laikas (sek.)"
 msgid "Maximum Entries"
 msgstr "Įrašų maksimumas"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Pagrindinis"
 
@@ -2151,7 +2151,7 @@ msgid "Exporting file:"
 msgstr "Eksportuojama byla:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr " Pasirinti... "
 
@@ -3613,7 +3613,7 @@ msgstr "Prijungti naują visų sąskaitų paštą"
 msgid "Send queued message(s)"
 msgstr "Siųsti laiškus eilėje"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Rašyti"
@@ -3638,7 +3638,7 @@ msgstr "Atsakyti visus"
 msgid "Reply to all"
 msgstr "Atsakyti į visus"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Persiųsti"
 
@@ -3916,213 +3916,213 @@ msgstr ""
 "Bloga slapta frazė! Bandykite dar kartą...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Atveriamas sąskaitos nustatymų langas...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Sąskaita%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Naujos sąskaitos nustatymai"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Sąskaitos nustatymai"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Sukuriamas sąskaitos nustatymų langas...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Gauti"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Privatumas"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Papildomi"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Sąskaitos vardas"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "Pažymėti kaip įprastą"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Asmeninė informacija"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Pilnas vardas"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "El. pašto adresas"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Organizacija"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Severio informacija"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "Naujienos (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Vietinis"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Serveris reikalauja patvirtinti autentiškumą"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "Naujienų serveris"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Serveris pašto gavimui"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "SMTP serveris (siuntimui)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "Vartotojo ID"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 msgid "Use secure authentication (APOP)"
 msgstr "Naudoti saugų autentiškumo tikrinimą (APOP)"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Po gavimo pašalinti žinutes iš serverio"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "Pašalinti po"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "dienų"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 dienų: pašalinti iš karto)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Atsisiųsti visas žinutes serveryje"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "Dydžio limitas"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Filtruoti žinutes gaunant"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Gaunamų laiškų dėžutė"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Nefiltruotos žinutės bus laikomos šiame kataloge."
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "Autentiškumo patikrinimo metodas"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Automatinis"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "Naujienos"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 msgid "Maximum number of articles to download"
 msgstr "Maksimalus parsiunčiamų žinučių skaičius"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 msgid "No limit if 0 is specified."
 msgstr "Nelimituojama, jei nurodyta „0“."
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "„Gauti visus“ tinkrina žinutes šioje sąskaitoje"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Antraštė"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Pridėti „Date“ antraštės lauką"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Generuoti „Message-ID“"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Pridėti vartotojo nustatytas antraštes"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " Redaguoti... "
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Autentiškumo patikrinimas"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP autentiškumo patikrinimas (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4130,177 +4130,190 @@ msgstr ""
 "Jei paliksite šiuos laukus tuščius, bus naudojamas tas pats vartotojo ID ir "
 "slaptažodis kaip ir gaunant."
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Prieš siunčiant patikrinti autentiškumą su POP3"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 msgid "Command output"
 msgstr "Komandos išvestis"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Automatiškai nustatyti sekančius adresus"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Pasirašyti žinutes"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "Koduoti žinutes"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr "Koduoti kai atsakoma į koduotą žinutę"
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "Naudoti „ASCII-armored“ formatą kodavimui"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "Naudoti „clear text“ parašą"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Parašo raktas"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Naudoti numatytąjį GnuPG raktą"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Parinkti raktą pagal jūsų el. pašto adresą"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Nurodyti raktą"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "Vartotojo arba rakto ID"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "Nenaudoti SSL"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "Naudoti SSL POP3 prisijungimui"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Naudoti STARTTLS komandą SSL sesijos pradžiai"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "Naudoti SSL IMAP4 prisijungimui"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "Naudoti SSL NNTP prisijungimui"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Siuntimas (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "Naudoti SSL SMTP prisijungimui"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr "Naudoti „non-blocking SSL“"
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Išjunkite, jei turite problemų su SSL prisijungimais."
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "Nurodykite SMTP prievadą"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "Nurodykite POP3 prievadą"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "Nurodykite IMAP4 prievadą"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "Nurodykite NNTP prievadą"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Nurodykite domeno vardą"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "IMAP serverio katalogas"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "Siųstas žinutes dėti į"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "Juodraščius dėti į"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Ištrintas žinutes dėti į"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "Ištrintas žinutes dėti į"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "Neįvestas sąskaitos pavadinimas."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "Neįvestas pašto adresas."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "Neįvestas SMTP serveris."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "Neįvestas vartotojo ID."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "Neįvestas POP3 serveris."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "Neįvestas IMAP4 serveris."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "Neįvestas NNTP serveris."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5283,7 +5296,7 @@ msgstr "Senas „Sylpheed“"
 msgid "Custom header setting"
 msgstr "Pasirinktų antraščių nustatymai"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr " Ištrinti "
 
@@ -5339,197 +5352,197 @@ msgstr "Įrašoma antraščių rodymo konfigūracija...\n"
 msgid "This header is already in the list."
 msgstr "Ši antraštė jau yra sąraše."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Filtro nustatymai"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr "Aktyvus"
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Ar tikrai norite ištrinti taisyklę „%s“?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Ištrinti taisyklę"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 msgid "Filter rule"
 msgstr "Filtro taisyklė"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr "Jei teisingas nors vienas"
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr "Jei teisingi visi"
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr "Atlikti veiksmus:"
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr "Gavėjas arba kopija"
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 msgid "Any header"
 msgstr "Bet kuri antraštė"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 msgid "Edit header..."
 msgstr "Redaguoti antraštę..."
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 msgid "Message body"
 msgstr "Žinutės tekstas"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr "Komandos rezultatas"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr "Amžius"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "turi"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 msgid "doesn't contain"
 msgstr "neturi"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr "yra"
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr "nėra"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr "tinka „regex“"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr "netinka „regex“"
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr "yra didesnis už"
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr "yra mažesnis už"
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr "yra ilgesnis už"
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr "yra trumpesnis už"
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 msgid "Move to"
 msgstr "Perkelti"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 msgid "Copy to"
 msgstr "Kopijuoti"
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Negauti"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 msgid "Delete from server"
 msgstr "Ištrinti iš serverio"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 msgid "Set mark"
 msgstr "Pažymėti"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 msgid "Set color"
 msgstr "Nuspalvinti"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 msgid "Mark as read"
 msgstr "Pažymėti skaityta"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 msgid "Forward as attachment"
 msgstr "Persiųsti kaip priedą"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 msgid "Redirect"
 msgstr "Nukreipti"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 msgid "Execute command"
 msgstr "Vykdyti komandą"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr "Nutraukti taisyklės vykdymą"
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 msgid "folder:"
 msgstr "katalogas:"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 msgid "day(s)"
 msgstr "diena(-os)"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 msgid "address:"
 msgstr "adresas:"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 msgid "Edit header list"
 msgstr "Redaguoti antraščių sąrašą"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 msgid "Headers"
 msgstr "Antraštės"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 msgid "Header:"
 msgstr "Antraštė:"
 
-#: src/prefs_filter_edit.c:1679
-msgid "Rule name is not specified."
-msgstr "Nenurodytas taisyklės pavadinimas."
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 msgid "Command is not specified."
 msgstr "Nenurodyta komanda."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr "Egzistuoja neteisinga sąlyga."
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 msgid "Destination folder is not specified."
 msgstr "Nenurodytas katalogas."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+msgid "Rule name is not specified."
+msgstr "Nenurodytas taisyklės pavadinimas."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr "Egzistuoja neteisinga sąlyga."
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr "Neteisingas veiksmas"
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 msgid "Condition not exist."
 msgstr "Sąlyga neegzistuoja."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 msgid "Action not exist."
 msgstr "Veiksmas neegzistuoja."
 
@@ -5976,15 +5989,20 @@ msgstr "tik skaitymui"
 msgid "unknown"
 msgstr "nežinomas"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "Negaliu gauti naujienų grupių sąrašo."
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Negaliu gauti naujienų grupių sąrašo."
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Atlikta."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "Gauta naujienų grupių: %d (%s skaityta)"
diff --git a/po/nl.po b/po/nl.po
index c4ea840d..b295736a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+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,9 +18,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Accountinstellingen worden ingelezen...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "opslaan van de configuratie is mislukt\n"
@@ -45,184 +45,184 @@ msgstr "IMAP4 verbinding naar %s:%d wordt opgezet...\n"
 msgid "Can't start TLS session.\n"
 msgstr "Kan geen TLS sessie starten.\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Bezig met verwijderen van bericht %d"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Bezig met verzenden van bericht (%d / %d bytes)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Bericht %s%c%d wordt verplaatst naar %s ...\n"
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Bericht %s%c%d wordt gekopieerd naar %s...\n"
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Berichten worden van %s naar %s opgehaald...\n"
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kan verwijderde vlaggen: %d niet instellen\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "kan niet wissen\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Berichten worden van %s naar %s opgehaald...\n"
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kan de vlaggen \"verwijderd\" : 1.%d niet instellen\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "kan map niet selecteren: %s\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Markeerbestand is niet gevonden\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "er is een fout opgetreden tijdens het ophalen van de LIST.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr ""
 "kan %s niet aanmaken\n"
 "\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "kan %s niet aanmaken onder INBOX\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Ik kan geen mailbox maken: LIST mislukt\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "Ik kan geen mailbox maken\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, 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:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "Ik kan de mailbox niet verwijderen\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "Ik kan de envelope niet verkrijgen\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Bezig met verzenden van bericht (%d / %d bytes)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "Er is een fout opgetreden bij het verkrijgen van de envelope.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "Ik kan de envelope niet verwerken: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, 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:2475
+#: libsylph/imap.c:2487
 #, 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:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "kan de NAMESPACE niet vinden\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan map niet selecteren: %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "Fout tijdens IMAP opdracht: EXPUNGE\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Identificatiemethode"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login mislukt.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan %s niet toevoegen aan %s\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(bestand wordt verzonden...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "kan bericht %s niet toevoegen\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan %d niet naar %s kopiëren\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, 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:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Fout tijdens IMAP opdracht: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "Fout tijdens IMAP opdracht: EXPUNGE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan UTF-7 niet naar %s omzetten\n"
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan %s niet naar UTF-7 omzetten\n"
@@ -309,30 +309,30 @@ msgstr "kan de mailbox niet inkorten tot 0.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Berichten worden geëxporteerd van %s naar %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "kan bericht niet kopiëren van %s naar %s\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "kan het bestand met markeringen niet openen\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "de bronmap is hetzelfde als de doelmap.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Bericht %s%c%d wordt gekopieerd naar %s...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Laatste nummer in map %s = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -341,7 +341,7 @@ msgstr ""
 "Bestand '%s' bestaat al.\n"
 "Kan geen map aanmaken."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -365,71 +365,71 @@ msgstr ""
 "De NNTP-verbinding met %s:%d is verbroken. Opnieuw contact aan het "
 "leggen...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "artikel %d is al gebufferd.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "artikel %d wordt opgehaald...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "kan artikel %d niet lezen\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "kan nieuwgroepenlijst niet ophalen\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "kan het ertikel niet versturen.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "kan het artikel %d niet ophalen\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "kan groep %s niet selecteren\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ongeldig artikelbereik: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "geen nieuwe artikelen.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "xover %d - %d uit %s wordt opgehaald...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "Kan xover niet ophalen\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "er is een fout opgetreden tijdens het ophalen van de xover.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "Ongeldige xover regel: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "Kan xhdr niet ophalen\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "er is een fout opgetreden tijdens het ophalen van de xhdr.\n"
 
@@ -527,16 +527,16 @@ msgstr "Accounts"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Codeconversie mislukt\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "kan het bestand met markeringen niet openen\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kan bericht %d niet ophalen\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Opdracht voor het afdrukken in onjuist: '%s'\n"
@@ -729,12 +729,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Naam"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Protocol"
 
@@ -742,7 +742,7 @@ msgstr "Protocol"
 msgid "Server"
 msgstr "Server"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Bewerken"
 
@@ -756,7 +756,7 @@ msgstr " Instellen als hoofdaccount"
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Wilt u dit account werkelijk verwijderen?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Geen titel"
@@ -1006,7 +1006,7 @@ msgstr "E-mail adres"
 msgid "Address book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Naam:"
 
@@ -1021,7 +1021,7 @@ msgstr "Verwijderen"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Toevoegen"
 
@@ -1194,7 +1194,7 @@ msgid "Group"
 msgstr "Groep"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Accounts"
 
@@ -1747,12 +1747,12 @@ msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Verzenden"
@@ -1794,7 +1794,7 @@ msgid "Attach file"
 msgstr "Bestand bijvoegen"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Tekenen"
@@ -2007,7 +2007,7 @@ msgid " Check File "
 msgstr " Controleer bestand"
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Bestand"
 
@@ -2086,7 +2086,7 @@ msgid "Edit JPilot Entry"
 msgstr "Bewerk JPilot veld"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr "Bladeren..."
@@ -2151,7 +2151,7 @@ msgstr "Timeout (sec)"
 msgid "Maximum Entries"
 msgstr "Maximum aantal velden"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Algemeen"
 
@@ -2209,7 +2209,7 @@ msgid "Exporting file:"
 msgstr "Doelbestand:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr "Selecteer..."
 
@@ -3697,7 +3697,7 @@ msgstr "E-mail van alle accounts ophalen en in de lijsten zetten"
 msgid "Send queued message(s)"
 msgstr "Verzend berichten uit de wachtrij"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Opstellen"
@@ -3722,7 +3722,7 @@ msgstr "Iedereen"
 msgid "Reply to all"
 msgstr "Bericht naar iedereen terugsturen."
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Doorsturen"
 
@@ -4002,219 +4002,219 @@ msgid ""
 "\n"
 msgstr "Slecht wachtwoord! Probeer opnieuw...\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Venster accountvoorkeuren wordt geopend...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Voorkeuren voor nieuw account"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Accountvoorkeuren"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Venster accountvoorkeuren wordt geopend...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Ontvangen"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Naam van dit account"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "Instellen als standaard"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Persoonlijke informatie"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Volledige naam"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "E-mail adres"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Organisatie"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Serverinformatie"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "Nieuws (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Niets (lokaal)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Deze server vereist authentificatie"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "Nieuwsserver"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Server om van te ontvangen"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "SMTP server (om te verzenden)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "Gebruikersnaam"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Deze server vereist authentificatie"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Verwijder berichten op de server wanneer ze worden opgehaald"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "Verwijderen na"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "dagen"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 dagen: direct verwijderen)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Haal alle berichten op van server"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "Limiet ontvangstgrootte"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Filter de berichten bij het ophalen"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Standaard inbox"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Ongefilterde berichten zullen hier opgeslagen worden)"
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "Identificatiemethode"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "Nieuws"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maximum aantal te downloaden artikelen\n"
 "(0 = alles)"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "'Alles ophalen' haalt de e-mail voor dit account op"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Header"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Datum veld toevoegen aan header"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Bericht-ID aanmaken"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Voeg een door de gebruiker gespecificeerde header toe"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr "Bewerken"
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Identificatie"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP identificatie (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4224,178 +4224,191 @@ msgstr ""
 "naam/wachtwoord-paar gebruikt worden als\n"
 "voor het ontvangen."
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Identificatie met POP3 voor het verzenden"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 #, fuzzy
 msgid "Command output"
 msgstr "Opdracht"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Stel automatisch de volgende adressen in"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Antwoorden naar"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Standaard een identificatiehandtekening toevoegen"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "Standaard het bericht coderen"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "ASCII-versterkt formaat gebruiken voor codering"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "Teksthandtekening gebruiken"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Signeersleutel"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Gebruik standaard GnuPG sleutel"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Selecteer sleutel naar e-mail adres"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Specificeer sleutel zelf"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "Gebruikers- of sleutel-ID:"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "Geen SSL gebruiken"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "SSL gebruiken voor POP3 verbinding"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Het STARTTLS commando gebruiken om een SSL sessie te starten"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL gebruiken voor IMAP verbinding"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "SSL gebruiken voor NNTP verbinding"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Verzenden (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "SSL gebruiken voor SMTP verbinding"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "SMTP poort"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "POP3 poort"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "IMAP4 poort"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "SMTP poort"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Specificeer domeinnaam"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "IMAP server-map"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "Verzonden berichten opslaan in"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "Kladberichten opslaan in"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Verwijderde berichten opslaan in"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "Verwijderde berichten opslaan in"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "Accountnaam is niet ingevuld."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "E-mail adres is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "SMTP server is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "Gebruikersnaam is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "POP3 server is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 server is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "NNTP server is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5401,7 +5414,7 @@ msgstr "Oude Sylpheed"
 msgid "Custom header setting"
 msgstr "Header aanpassen"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr "Verwijderen"
 
@@ -5457,221 +5470,221 @@ msgstr "Configuratie voor headerweergave wordt opgeslagen...\n"
 msgid "This header is already in the list."
 msgstr "Deze header staat al in de lijst."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Filterbeheer"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Wil je deze regel werkelijk verwijderen?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Verwijder deze regel"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 #, fuzzy
 msgid "Filter rule"
 msgstr "Verwijder deze regel"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 #, fuzzy
 msgid "Any header"
 msgstr "Verborgen headers"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 #, fuzzy
 msgid "Edit header..."
 msgstr "Header"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 #, fuzzy
 msgid "Message body"
 msgstr "Bericht"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "bevat"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 #, fuzzy
 msgid "doesn't contain"
 msgstr "bevat geen"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 #, fuzzy
 msgid "Move to"
 msgstr "Omlaag"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 #, fuzzy
 msgid "Copy to"
 msgstr "/_Kopieer..."
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Ontvangst weigeren"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 #, fuzzy
 msgid "Delete from server"
 msgstr "Verwijder map"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 #, fuzzy
 msgid "Set mark"
 msgstr "Opmerkingen"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 #, fuzzy
 msgid "Set color"
 msgstr "Berichtkleuren instellen"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 #, fuzzy
 msgid "Mark as read"
 msgstr "/_Markeren/Als _gelezen"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/Doorsturen als _bijvoeging"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 #, fuzzy
 msgid "Redirect"
 msgstr "/_Omleiden"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 #, fuzzy
 msgid "Execute command"
 msgstr "Uitvoeren"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 #, fuzzy
 msgid "folder:"
 msgstr "Accounts"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 #, fuzzy
 msgid "day(s)"
 msgstr "dagen"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 #, fuzzy
 msgid "address:"
 msgstr "Adres"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 #, fuzzy
 msgid "Edit header list"
 msgstr "Header"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 #, fuzzy
 msgid "Headers"
 msgstr "Header"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 #, fuzzy
 msgid "Header:"
 msgstr "Header"
 
-#: src/prefs_filter_edit.c:1679
-#, fuzzy
-msgid "Rule name is not specified."
-msgstr "Ontvanger is niet gespecificeerd."
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Opdrachtregel is niet ingesteld."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Er is geen map gekozen om het heen te verplaatsen."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+#, fuzzy
+msgid "Rule name is not specified."
+msgstr "Ontvanger is niet gespecificeerd."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Opdrachtregel is niet ingesteld."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: bestand bestaat niet\n"
@@ -6120,15 +6133,20 @@ msgstr "alleen lezen"
 msgid "unknown"
 msgstr "onbekend"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "Kan geen nieuwsgroep opvragen."
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan geen nieuwsgroep opvragen."
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Klaar."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d nieuwsgroepen ontvangen (%s ingelezen)"
diff --git a/po/pl.po b/po/pl.po
index efbea64f..dd293f0c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.9.8 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+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,9 +15,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Odczyt ustawień wszystkich kont...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "błąd podczas zapisu konfiguracji do pliku\n"
@@ -42,177 +42,177 @@ msgstr "tworzenie połączenia IMAP4 do %s:%d ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "Nie można uruchomić sesji TLS\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Usuwanie wiadomości %d"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Wysyłanie wiadomości (%d / %d)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Kopiowanie wiadomości %s%c%d do %s ...\n"
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiowanie wiadomości %s%c%d do %s ...\n"
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Pobieranie wiadomości z %s..."
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nie można ustawić flag skasowany: %s\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "nie można zlikwidować\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Pobieranie wiadomości z %s..."
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nie można ustawić flagi skasowany: 1:*\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 msgid "can't close folder\n"
 msgstr "nie można zamknąć katalogu\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "brak głównego katalogu %s\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 msgid "error occurred while getting LIST.\n"
 msgstr "wystąpił błąd podczas przy pobieraniu LIST.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "nie można utworzyć \"%s\"\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "nie można utworzyć \"%s\" w INBOX\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nie można utworzyć skrzynki: błąd LIST.\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "nie można utworzyć skrzynki\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, 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:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "nie można skasować skrzynki\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "nie można pobrać koperty\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Wysyłanie wiadomości (%d / %d)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "wystąpił błąd podczas pobierania koperty.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "nie można przetworzyć koperty: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, 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:2475
+#: libsylph/imap.c:2487
 #, 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:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "nie można pobrać przestrzeni nazw\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nie można wybrać katalogu: %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: CLOSE\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 msgid "IMAP4 authentication failed.\n"
 msgstr "Błąd uwierzytelniania IMAP4.\n"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "Nie można zalogować się do serwera IMAP4.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nie można dołączyć %s do %s\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(wysyłanie pliku...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nie można dołączyć wiadomości do %s\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nie można skopiować %s do %s\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, 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:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 msgid "error while imap command: CLOSE\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: CLOSE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, 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:4025
+#: libsylph/imap.c:4037
 #, 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"
@@ -299,30 +299,30 @@ msgstr "nie można skrócić do zera.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Eksportowanie wiadomości z %s do %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "nie można skopiować wiadomości %s do %s\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "Nie można otworzyć pliku zaznaczeń.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "katalog źródłowy jest taki sam jak docelowy.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopiowanie wiadomości %s%c%d do %s ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Ostatni numer w katalogu %s = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -331,7 +331,7 @@ msgstr ""
 "Plik \"%s\" już istnieje.\n"
 "Nie można utworzyć katalogu."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -354,71 +354,71 @@ msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr ""
 "Połączenie NNTP %s:%d zostało zerwane. Ponowne nawiązywanie połączenia...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "artykuł %d został już zapamiętany.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "pobieranie artykułu %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "nie można odczytać artykułu %d\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "nie można pobrać listy grup news\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "nie można wysłać artykułu.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "nie można odebrać artykułu %d\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "nie można wybrać grupy: %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "niepoprawny zakres artykułu: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "brak nowych artykułów.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "pobieranie xover %d - %d w %s...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "nie można pobrać xover\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "błąd podczas pobierania xover.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "niepoprawna linia xover: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "nie można pobrać xhdr\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "błąd podczas pobierania xhdr.\n"
 
@@ -513,16 +513,16 @@ msgstr "Niechciana poczta"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmine_get_text_content(): Błąd konwersji kodu.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "nie można otworzyć pliku zaznaczeń\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nie można pobrać wiadomości %d\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Błędny wiersz polecenia wydruku: \"%s\"\n"
@@ -713,12 +713,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Protokół"
 
@@ -726,7 +726,7 @@ msgstr "Protokół"
 msgid "Server"
 msgstr "Serwer"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Edycja"
 
@@ -740,7 +740,7 @@ msgstr " Ustaw jako podstawowe konto "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto '%s'?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 msgid "(Untitled)"
 msgstr "(Nienazwany)"
 
@@ -991,7 +991,7 @@ msgstr "Adres e-mail"
 msgid "Address book"
 msgstr "Książka adresowa"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Nazwa:"
 
@@ -1006,7 +1006,7 @@ msgstr "Usuń"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Dodaj"
 
@@ -1181,7 +1181,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Katalog"
 
@@ -1699,12 +1699,12 @@ msgid "MIME type"
 msgstr "typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Wyślij"
@@ -1746,7 +1746,7 @@ msgid "Attach file"
 msgstr "Dołącz plik"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Podpis"
@@ -1958,7 +1958,7 @@ msgid " Check File "
 msgstr " Sprawdź plik"
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Plik"
 
@@ -2036,7 +2036,7 @@ msgid "Edit JPilot Entry"
 msgstr "Edytuj wpis JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2101,7 +2101,7 @@ msgstr "Opóźnienie (sek)"
 msgid "Maximum Entries"
 msgstr "Maksymalna ilość pozycji"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Podstawowe"
 
@@ -2158,7 +2158,7 @@ msgid "Exporting file:"
 msgstr "Eksportowanie pliku:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr " Wybierz... "
 
@@ -3615,7 +3615,7 @@ msgstr "Odbierz nową pocztę z wszystkich kont"
 msgid "Send queued message(s)"
 msgstr "Wyślij wiadomości z kolejki"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Utwórz"
@@ -3640,7 +3640,7 @@ msgstr "Odp. na wsz."
 msgid "Reply to all"
 msgstr "Odpowiedz na wszystkie"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Przekaż"
 
@@ -3919,218 +3919,218 @@ msgstr ""
 "Niewłaściwe hasło! Spróbuj ponownie...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Otwieranie okna preferencji konta...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Preferencje nowego konta"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Preferencje konta"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Tworzenie okna preferencji okna...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Odbieranie"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Prywatność"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Nazwa tego konta"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "Ustaw jako domyślne"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Informacje osobiste"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Pełna nazwa"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "Adres e-mail"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Organizacja"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Informacje o serwerze"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Żaden (lokalnie)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Ten serwer wymaga autoryzacji"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "Serwer news"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Serwer dla odbioru"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "Serwer SMTP (dla wysyłania)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "Identyfikator użytkownika"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Hasło"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 msgid "Use secure authentication (APOP)"
 msgstr "Użyj bezpiecznej autentykacji (APOP)"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Usuwanie wiadomości z serwera po odebraniu"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "Usuwanie po"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "dniach"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 dni: usuwa natychmiast)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Pobieranie wszystkich wiadomości z serwera"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "Ograniczenie wielkości pobierania"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Filtrowanie wiadomości podczas odbierania"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Domyślny inbox"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nieprzefiltrowane wiadomości zostaną zachowane w tym katalogu)"
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "Sposób uwierzytelniania"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maksymalna liczba pobieranych artykułów\n"
 "(bez ograniczeń - 0)"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "\"Odbierz wszystkie\" sprawdza pocztę dla tego konta"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Nagłówek"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Dodawanie pola Data do nagłówka"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Generowanie identyrikatora wiadomości"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Dodawanie nagłówka zdefiniowanego przez użytkownika"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr "Edycja..."
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Uwierzytelnianie SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4138,178 +4138,191 @@ msgstr ""
 "Jeśli te pola pozostaną puste, użyty zostanie ten sam login i hasło, co przy "
 "odbieraniu."
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Uwierzytelnianie POP3 przed wysyłaniem"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 msgid "Command output"
 msgstr "Wyjście polecenia"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Automatyczne ustawianie następujących adresów"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Kopia"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Ukryta kopia"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Adres zwrotny"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Domyślnie podpisywanie wiadomości"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "Domyślnie szyfrowanie wiadomości"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "Używanie formatu ASCII-armored dla szyfrowania"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "Wstawianie podpisu czystym tekstem"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Klucz"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Używanie standardowego klucza GnuPG"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Wybieranie klucz poprzez swój adres e-mail"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Ręczne określanie klucza"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "Użytkownik lub klucz ID:"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "Nie korzystanie z SSL"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "Używanie SSL dla połączeń POP3"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Używanie polecenia STARTTLS by rozpocząć sesję SSL"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "Używanie SSL dla połączeń IMAP4"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "Używanie SSL dla połączeń NNTP"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Wysyłanie (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "Używanie SSL dla połączeń SMTP"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr "Używanie nieblokującego SSL"
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(Wyłącz to, jeśli masz problemy z połączeniem SSL)"
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "Określ port SMTP"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "Określ port POP3"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "Określ port IMAP4"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "Określ port NNTP"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Określ nazwę domeny"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "Katalog serwera IMAP4."
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "Zapisywanie wysłanych wiadomości do"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "Zapisywanie szablonów wiadomości do"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Zapisywanie usuniętych wiadomości do"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "Zapisywanie usuniętych wiadomości do"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "Nie określono nazwy konta."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "Nie określono adresu e-mail."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "Nie określono serwera SMTP."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "Nie określono ID użytkownika."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "Nie określono serwera POP3."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "Nie określono serwera IMAP4."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "Nie określono serwera NNTP."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5297,7 +5310,7 @@ msgstr "Dawny Sylpheed"
 msgid "Custom header setting"
 msgstr "Ustawienia nagłówka użytkownika"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr " Usuń "
 
@@ -5353,199 +5366,199 @@ msgstr "Zapisywanie konfiguracji wyświetlania nagłówków...\n"
 msgid "This header is already in the list."
 msgstr "Taki nagłówek już występuje."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Reguły filtrowania"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr "Aktywna"
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Naprawdę chcesz usunąć regułkę '%s'?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Usuń regułę"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 msgid "Filter rule"
 msgstr "Reguła filtrowania"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr "Jeśli dowolna z poniższych reguł pasuje"
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr "Jeśli wszystkie poniższe reguły pasują"
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr "Podejmij działania:"
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 msgid "Any header"
 msgstr "Dowolny nagłówek"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 msgid "Edit header..."
 msgstr "Edytuj nagłówki..."
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 msgid "Message body"
 msgstr "Treść wiadomości"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr "Wynik polecenia"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr "Wiek"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "zawiera"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 msgid "doesn't contain"
 msgstr "nie zawiera"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr "równe"
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr "nie równe"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr "pasuje do wyrażenia"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr "nie pasuje do wyrażenia"
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr "większe niż"
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr "mniejsze niż"
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr "dłuższe niż"
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr "krótsze niż"
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 msgid "Move to"
 msgstr "Przenieś do"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 msgid "Copy to"
 msgstr "Kopiuj do"
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Nie odbieraj"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 msgid "Delete from server"
 msgstr "Usuń z serwera"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 msgid "Set mark"
 msgstr "Zaznacz"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 msgid "Set color"
 msgstr "Ustaw kolor"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 msgid "Mark as read"
 msgstr "Zaznacz jako przeczytane"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 msgid "Forward as attachment"
 msgstr "Przekaż jako załącznik"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 msgid "Redirect"
 msgstr "Przekieruj"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 msgid "Execute command"
 msgstr "Wykonaj polecenie"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr "Zatrzymaj sprawdzanie regułek"
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 msgid "folder:"
 msgstr "katalog:"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 #, fuzzy
 msgid "day(s)"
 msgstr "dniach"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 msgid "address:"
 msgstr "adres:"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 msgid "Edit header list"
 msgstr "Edytuj listę nagłówków"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 msgid "Headers"
 msgstr "Nagłówki"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 msgid "Header:"
 msgstr "Nagłówek:"
 
-#: src/prefs_filter_edit.c:1679
-msgid "Rule name is not specified."
-msgstr "Nie podano nazwy regułki."
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 msgid "Command is not specified."
 msgstr "Nie ustawiono polecenia."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 msgid "Destination folder is not specified."
 msgstr "Nie został wybrany katalog docelowy."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+msgid "Rule name is not specified."
+msgstr "Nie podano nazwy regułki."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Nie ustawiono polecenia."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 msgid "Action not exist."
 msgstr "Akcja nie istnieje."
 
@@ -5988,15 +6001,20 @@ msgstr "tylko do odczytu"
 msgid "unknown"
 msgstr "nieznany"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "Nie można pobrać listy grup dyskusyjnych."
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Nie można pobrać listy grup dyskusyjnych."
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Gotowe."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "pobrano %d grup dyskusyjnych (%s przeczytano)"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 35a979f6..96ad1b8f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-06 19:26+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+0900\n"
 "PO-Revision-Date: 2005-12-05 12:32-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: André Casteliano <digitalcoder@users.sourceforge.net> Isaías "
@@ -21,9 +21,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Lendo as configurações de cada conta...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "falhou ao gravar a configuração no arquivo\n"
@@ -46,176 +46,176 @@ msgstr "criando conexão IMAP4 com %s:%d ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "Não foi possível iniciar sessão TLS.\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, c-format
 msgid "Getting message %d"
 msgstr "Buscando mensagem %d"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Adicionando mensagens em %s (%d / %d)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Movendo mensagens %s para %s ..."
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiando mensagesn %s para %s ..."
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, c-format
 msgid "Removing messages %s"
 msgstr "Removendo mensagens %s"
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "não posso marcar como apagado: %s\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "não posso eliminar\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Removendo todas as mensagens em %s"
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 msgid "can't set deleted flags: 1:*\n"
 msgstr "não posso marcar como apagado: 1:*\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 msgid "can't close folder\n"
 msgstr "não posso fechar pasta\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "pasta raiz %s inexistente\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 msgid "error occurred while getting LIST.\n"
 msgstr "erro recebendo resultados do LIST.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Não foi possível criar '%s'\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, 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:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "não posso criar caixa de correio: LIST falhou\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "não posso criar caixa de correio\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, 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:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "não posso apagar caixa de correio\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "Não foi possível obter o 'envelope'\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Buscando cabeçalhos das mensagens (%d / %d)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "Ocorreu um erro ao obter 'envelope'\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, 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:2468
+#: libsylph/imap.c:2480
 #, 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:2475
+#: libsylph/imap.c:2487
 #, 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:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "Não foi possível obter o 'envelope'\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "não posso selecionar pasta: %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 msgid "error on imap command: STATUS\n"
 msgstr "erro no comando imap: STATUS\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 msgid "IMAP4 authentication failed.\n"
 msgstr "Falha na autenticação IMAP4.\n"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "Falha ao logar no servidor IMAP4.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, 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:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(enviando arquivo...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, 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:3677
+#: libsylph/imap.c:3689
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "não posso copiar %s para %s\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erro no comando imap: STORE %s %s\n"
 
-#: libsylph/imap.c:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 msgid "error while imap command: CLOSE\n"
 msgstr "erro no comando imap: CLOSE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, 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:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "o iconv não pode converter %s para UTF-7\n"
@@ -302,30 +302,30 @@ msgstr "não foi possível zerar o mailbox.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportando mensagens de %s em %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "não foi possível copiar a mensagem %s para %s\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "Não foi possível abrir o arquivo de marcas.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "pastas de origem e destino são idênticas.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copiando mensagem %s%c%d para %s ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Último número no diretório %s = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -334,7 +334,7 @@ msgstr ""
 "O arquivo `%s' já existe.\n"
 "Não foi possível criar a pasta."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -363,71 +363,71 @@ msgstr "criando conexão NNTP com %s:%d ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "A conexão NNTP com %s:%d terminou. Reconectando...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "o artigo %d já está no cache.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "obtendo artigo %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "não foi possível ler o artigo %d\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "não foi possível obter a lista de grupo de notícias\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "não posso postar artigo.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "não foi possível obter o artigo %d\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "não foi possível selecionar o grupo: %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "intervalo de artigos inválido: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "não há novos artigos.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obtendo xover %d - %d en %s...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "não foi possível obter xover\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "ocorreu um erro ao obter xover.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "linha xover inválida: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "não foi possível obter xover\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "ocorreu um erro ao obter xover.\n"
 
@@ -521,16 +521,16 @@ msgstr "Filtro de spam"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Conversão de código falhou.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "não foi possível abrir o arquivo de marcas\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "não posso obter mensagem %d\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "O comando de impressão é inválido: `%s'\n"
@@ -718,12 +718,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Nome"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -731,7 +731,7 @@ msgstr "Protocolo"
 msgid "Server"
 msgstr "Servidor"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Editar"
 
@@ -744,7 +744,7 @@ msgstr " _Marcar como conta padrão "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Quer realmente apagar a conta '%s'?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 msgid "(Untitled)"
 msgstr "(Sem título)"
 
@@ -995,7 +995,7 @@ msgstr "Endereço de e-mail"
 msgid "Address book"
 msgstr "Catálogo de endereços"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:253
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Nome:"
 
@@ -1010,7 +1010,7 @@ msgstr "Apagar"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1460
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Adicionar"
 
@@ -1182,7 +1182,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Pasta"
 
@@ -1701,12 +1701,12 @@ msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:476
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Enviar"
@@ -1748,7 +1748,7 @@ msgid "Attach file"
 msgstr "Anexar arquivo"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Assinatura"
@@ -1955,7 +1955,7 @@ msgid " Check File "
 msgstr " Verificar Arquivo "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Arquivo"
 
@@ -2034,7 +2034,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2099,7 +2099,7 @@ msgstr "Timeout (segundos)"
 msgid "Maximum Entries"
 msgstr "Máximo de Entradas"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Básicas"
 
@@ -2158,7 +2158,7 @@ msgid "Exporting file:"
 msgstr "Arquivo a exportar:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr "Selecionar..."
 
@@ -3616,7 +3616,7 @@ msgstr "Incorporar novas mensagens de todas as contas"
 msgid "Send queued message(s)"
 msgstr "Enviar Mensagem(s) da fila"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Escrever"
@@ -3641,7 +3641,7 @@ msgstr "Responder todas"
 msgid "Reply to all"
 msgstr "Responder para todos"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:632
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Encaminhar"
 
@@ -3920,213 +3920,213 @@ msgstr ""
 "Senha errada! Tente novamente...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Abrindo janela de preferências da conta...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Conta%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Preferências para a nova conta"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Preferências da Conta"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Criando janela de preferências da conta...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Receber"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Avançadas"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Nome desta conta"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "Marcar como padrão"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Informações pessoais"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Nome completo"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Organização"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Informações do servidor"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "Notícias (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Nenhuma (local)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Este servidor requer autenticação"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "Servidor de notícias"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Servidor de recepção"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (envio)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "Usuario"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Senha"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 msgid "Use secure authentication (APOP)"
 msgstr "Usar autenticação segura (APOP)"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Ao receber, eliminar a(s) mensagem(ns) do servidor"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "Remover depois de"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "dias"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 dias: remover imediatamente)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Receber todas as mensagens no servidor"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "Limite de tamanho de recebimento"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:534
-#: src/prefs_filter_edit.c:935
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensagens ao receber"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Caixa de Entrada Padrão"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Mensagens não filtradas serão guardadas nesta pasta."
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "Método de Autenticação"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "Notícias"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artigos para baixar"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 msgid "No limit if 0 is specified."
 msgstr "Sem limite se 0 for especificado."
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Obter todas' confere novas mensagens nessa conta"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Cabeçalho"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Adicionar campo de data"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Gerar Message-ID"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Adicionar cabeçalho do usuário"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " Editar... "
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Autenticação"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticação SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4134,177 +4134,190 @@ msgstr ""
 "Se você deixar essas entradas em branco, o mesmo ID de usuário e senha do "
 "recebimento serão usados."
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Autenticar com POP3 antes de enviar"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 msgid "Command output"
 msgstr "Saída de comando"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Estabelecer os seguintes endereços automaticamente"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Responder"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Assinar mensagens por padrão"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "Encriptar mensagems por padrão"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr "Encriptar quando responder uma mensagem encriptada"
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "Usar formato ASCII-armored para encriptação"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "Inserir assinatura de texto puro"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Assinar chave"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Usar chave GnuPG padrão"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Selecionar chave através de seu endereço de e-mail"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Especificar chave manualmente"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "Usuário ou ID da chave:"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "Não usar SSL"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "Utilizar SSL para conexão POP3"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Utilizar comando STARTTLS para iniciar a sessão SSL"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "Utilizar SSL para conexão IMAP4"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para conexão NNTP"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "Utilizar SSL para conexão SMTP"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr "Usar SSL não-bloqueante"
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Desabilite isso se você tiver problemas na conexão SSL"
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "Especifique a porta SMTP"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "Especifique a porta POP3"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "Especificar a porta IMAP4"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "Especificar a porta NNTP"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Especificar nome do domínio"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "Servidor de diretório IMAP"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "Colocar mensagens enviadas em"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "Colocar mensagens de rascunho em"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Colocar mensagens apagadas em"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "Colocar mensagens apagadas em"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "Nome da conta não definido."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "Endereço de e-mail não especificado."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "Servidor SMTP não especificado."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "Usuário não especificado."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "Servidor POP3 não especificado."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "Servidor IMAP4 não especificado."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "Servidor NNTP não especificado."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5282,7 +5295,7 @@ msgstr "Sylpheed antigo"
 msgid "Custom header setting"
 msgstr "Configuração de cabeçalho personalizado"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1463
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr " Apagar "
 
@@ -5338,197 +5351,197 @@ msgstr "Gravando configuração para os cabeçalhos mostrados...\n"
 msgid "This header is already in the list."
 msgstr "Este cabeçalho já está na lista."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Configuração de filtros"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Quer realmente apagar a regra '%s'?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Apagar regra"
 
-#: src/prefs_filter_edit.c:238
+#: src/prefs_filter_edit.c:236
 msgid "Filter rule"
 msgstr "Regra de filtragem"
 
-#: src/prefs_filter_edit.c:272
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr "Se alguma das seguintes condições casar"
 
-#: src/prefs_filter_edit.c:274
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr "Se todas as seguintes condições casarem"
 
-#: src/prefs_filter_edit.c:295
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr "Efetuar as seguintes ações:"
 
-#: src/prefs_filter_edit.c:469
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr "Para ou Cc"
 
-#: src/prefs_filter_edit.c:470
+#: src/prefs_filter_edit.c:490
 msgid "Any header"
 msgstr "Qualquer cabeçalho"
 
-#: src/prefs_filter_edit.c:471
+#: src/prefs_filter_edit.c:491
 msgid "Edit header..."
 msgstr "Editar cabeçalho..."
 
-#: src/prefs_filter_edit.c:474
+#: src/prefs_filter_edit.c:494
 msgid "Message body"
 msgstr "Corpo da mensagem"
 
-#: src/prefs_filter_edit.c:475
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr "Resultado de comando"
 
-#: src/prefs_filter_edit.c:477
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr "Idade"
 
-#: src/prefs_filter_edit.c:490
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "contém"
 
-#: src/prefs_filter_edit.c:492
+#: src/prefs_filter_edit.c:512
 msgid "doesn't contain"
 msgstr "não contém"
 
-#: src/prefs_filter_edit.c:494
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr "é"
 
-#: src/prefs_filter_edit.c:496
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr "não é"
 
-#: src/prefs_filter_edit.c:498
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr "casa com a expressão regular"
 
-#: src/prefs_filter_edit.c:500
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr "não casa com a expressão regular"
 
-#: src/prefs_filter_edit.c:510
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr "maior que"
 
-#: src/prefs_filter_edit.c:511
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr "menor que"
 
-#: src/prefs_filter_edit.c:520
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr "mais longo que"
 
-#: src/prefs_filter_edit.c:521
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr "mais curto que"
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:641
 msgid "Move to"
 msgstr "Mover para"
 
-#: src/prefs_filter_edit.c:621
+#: src/prefs_filter_edit.c:642
 msgid "Copy to"
 msgstr "Copiar para"
 
-#: src/prefs_filter_edit.c:622
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Não receber"
 
-#: src/prefs_filter_edit.c:623
+#: src/prefs_filter_edit.c:644
 msgid "Delete from server"
 msgstr "Apagar do servidor"
 
-#: src/prefs_filter_edit.c:626
+#: src/prefs_filter_edit.c:647
 msgid "Set mark"
 msgstr "Marcar"
 
-#: src/prefs_filter_edit.c:627
+#: src/prefs_filter_edit.c:648
 msgid "Set color"
 msgstr "Definir cor"
 
-#: src/prefs_filter_edit.c:628
+#: src/prefs_filter_edit.c:649
 msgid "Mark as read"
 msgstr "Marcar como lida"
 
-#: src/prefs_filter_edit.c:633
+#: src/prefs_filter_edit.c:654
 msgid "Forward as attachment"
 msgstr "Encaminhar como anexo"
 
-#: src/prefs_filter_edit.c:634
+#: src/prefs_filter_edit.c:655
 msgid "Redirect"
 msgstr "Redirecionar"
 
-#: src/prefs_filter_edit.c:638
+#: src/prefs_filter_edit.c:659
 msgid "Execute command"
 msgstr "Executar comando"
 
-#: src/prefs_filter_edit.c:641
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr "Para avaliação de regras"
 
-#: src/prefs_filter_edit.c:647 src/prefs_filter_edit.c:970
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 msgid "folder:"
 msgstr "pasta:"
 
-#: src/prefs_filter_edit.c:944
+#: src/prefs_filter_edit.c:965
 msgid "day(s)"
 msgstr "dia(s)"
 
-#: src/prefs_filter_edit.c:1010
+#: src/prefs_filter_edit.c:1031
 msgid "address:"
 msgstr "endereço:"
 
-#: src/prefs_filter_edit.c:1417
+#: src/prefs_filter_edit.c:1444
 msgid "Edit header list"
 msgstr "Editar lista de cabeçalhos"
 
-#: src/prefs_filter_edit.c:1440
+#: src/prefs_filter_edit.c:1467
 msgid "Headers"
 msgstr "Cabeçalhos"
 
-#: src/prefs_filter_edit.c:1451
+#: src/prefs_filter_edit.c:1478
 msgid "Header:"
 msgstr "Cabeçalho:"
 
-#: src/prefs_filter_edit.c:1567
-msgid "Rule name is not specified."
-msgstr "Nome da regra não especificado."
-
-#: src/prefs_filter_edit.c:1655 src/prefs_filter_edit.c:1734
-#: src/prefs_filter_edit.c:1742
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 msgid "Command is not specified."
 msgstr "Comando não especificado."
 
-#: src/prefs_filter_edit.c:1689
-msgid "Invalid condition exists."
-msgstr "Condição inválida existe."
-
-#: src/prefs_filter_edit.c:1711 src/prefs_filter_edit.c:1719
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 msgid "Destination folder is not specified."
 msgstr "Pasta destino não especificada."
 
-#: src/prefs_filter_edit.c:1773
+#: src/prefs_filter_edit.c:1786
+msgid "Rule name is not specified."
+msgstr "Nome da regra não especificado."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr "Condição inválida existe."
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr "Ação inválida existe."
 
-#: src/prefs_filter_edit.c:1782
+#: src/prefs_filter_edit.c:1832
 msgid "Condition not exist."
 msgstr "Condição inexistente."
 
-#: src/prefs_filter_edit.c:1784
+#: src/prefs_filter_edit.c:1834
 msgid "Action not exist."
 msgstr "Ação inexistente."
 
@@ -5973,15 +5986,20 @@ msgstr "somente para leitura"
 msgid "unknown"
 msgstr "desconhecido"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "apagando grupo de notícias %s ...\n"
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Não foi possível obter a lista de grupos de notícias."
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Feito."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d grupos de notícias recebidos (%s lidos)"
@@ -7353,9 +7371,6 @@ msgstr "Aviso de URL falsa"
 #~ msgid "deleting folder %s ...\n"
 #~ msgstr "apagando pasta %s ...\n"
 
-#~ msgid "deleting newsgroup %s ...\n"
-#~ msgstr "apagando grupo de notícias %s ...\n"
-
 #~ msgid "Input adding news server:"
 #~ msgstr "Nome do servidor de notícias:"
 
diff --git a/po/ro.po b/po/ro.po
index b8256aa5..13c4d972 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+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,9 +17,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Citire configuraţia conturilor...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "scrierea configuraţie în fişier a eşuat\n"
@@ -43,183 +43,183 @@ msgstr "creare conexiune IMAP4 la %s:%d ...\n"
 msgid "Can't start TLS session.\n"
 msgstr ""
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Ştergere mesaj"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Recepţionare mesaj (%d / %d) (%s / %s octeţi)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Mutare mesaj %s%c%d în %s ...\n"
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiere mesaj %s%c%d în %s ...\n"
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Recepţionare mesaje din %s în %s...\n"
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, 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:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "ştergere imposibilă\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Recepţionare mesaje din %s în %s...\n"
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "marcajul de ştergere nu a putut fi setat: 1:%d\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "directorul nu a putut fi selectat: %s\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Fişierul de marcaje nu a fost găsit.\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "a avut loc o eroare la comanda LIST.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, fuzzy, c-format
 msgid "Can't create '%s'\n"
 msgstr "nu poate fi creat %s\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, fuzzy, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "nu poate fi creat %s\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "crearea cutiei poştale a eşuat: LIST a eşuat.\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "crearea cutiei poştale este imposibilă\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, 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:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "ştergerea cutiei poştale este imposibilă\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "recepţionarea plicului nu a putut fi realizată\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Recepţionare mesaj (%d / %d) (%s / %s octeţi)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "a avut loc o eroare în timpul recepţionării plicului.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "plicul nu poate fi analizat: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, 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:2475
+#: libsylph/imap.c:2487
 #, 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:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "spaţiul de nume nu a putut fi obţinut\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "directorul nu a putut fi selectat: %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "eroare comandă IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autentificare..."
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "Logare IMAP4 eşuată.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nu a putut fi adăugat %s la %s\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 #, fuzzy
 msgid "(sending file...)"
 msgstr "Citire director %s ..."
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "mesajul %s nu a putut fi adăugat\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nu a putut fi copiat %d la %s\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "eroare comandă IMAP: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "eroare comandă IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "eroare comandă IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr ""
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
@@ -306,30 +306,30 @@ msgstr "vidarea cutiei poştale este imposibilă.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Recepţionare mesaje din %s în %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "copierea mesajului %s în %s a eşuat\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "Deschiderea fişierului marcaj este imposibilă.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "directorul sursă este identic cu cel destinaţie.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copiere mesaj %s%c%d în %s ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Ultimul număr din directorul %s = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -338,7 +338,7 @@ msgstr ""
 "Fişierul '%s' există deja.\n"
 "Directorul nu poate fi creat."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -360,73 +360,73 @@ msgstr "creare conexiune NNTP la %s:%d ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "Conexiunea NNTP la %s:%d a fost întreruptă. Reconectare...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "Articolul %d a fost deja stocat.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "Receptionare articol %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "articolul %d nu poate fi citit\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 #, fuzzy
 msgid "can't retrieve newsgroup list\n"
 msgstr "Lista de newsgroup-uri nu a putut fi obţinută."
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "postarea articolului este imposibilă.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "articolul %d nu poate fi recepţionat\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "grupul nu poate fi setat: %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "interval invalid: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "nu există articole noi.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "executare xover %d - %d în %s...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "xover imposibil\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "a avut loc o eroare în timpul execuţiei xover.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "linie xover invalidă: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 #, fuzzy
 msgid "can't get xhdr\n"
 msgstr "xover imposibil\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 #, fuzzy
 msgid "error occurred while getting xhdr.\n"
 msgstr "a avut loc o eroare în timpul execuţiei xover.\n"
@@ -529,16 +529,16 @@ msgstr "Director"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "Convertirea codului a eşuat.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "deschiderea fişierului de marcaje este imposibilă\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "mesajul %d nu a putut fi recepţionat\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Linia de comandă pentru imprimare este invalidă: '%s'\n"
@@ -734,12 +734,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Nume"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Protocol"
 
@@ -747,7 +747,7 @@ msgstr "Protocol"
 msgid "Server"
 msgstr "Server"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Editare"
 
@@ -761,7 +761,7 @@ msgstr " Setare drept cont curent "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi acest cont ?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Neintitulat"
@@ -1013,7 +1013,7 @@ msgstr "Adresă E-Mail"
 msgid "Address book"
 msgstr "Agendă"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr " Nume:"
 
@@ -1028,7 +1028,7 @@ msgstr "Ştergere"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Adăugare"
 
@@ -1203,7 +1203,7 @@ msgid "Group"
 msgstr "Groupă"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Director"
 
@@ -1762,12 +1762,12 @@ msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Trimitere"
@@ -1809,7 +1809,7 @@ msgid "Attach file"
 msgstr "Ataşare fişier"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Semnătură"
@@ -2024,7 +2024,7 @@ msgid " Check File "
 msgstr " Verificare Fişier "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Fişier"
 
@@ -2102,7 +2102,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editare Înregistrare JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2167,7 +2167,7 @@ msgstr "Timeout (secs)"
 msgid "Maximum Entries"
 msgstr "Număr Maxim de Înregistrări"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "General"
 
@@ -2226,7 +2226,7 @@ msgid "Exporting file:"
 msgstr "Exportare fişier:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr " Selectare... "
 
@@ -3815,7 +3815,7 @@ msgstr "Recepţionare mesaje noi pentru toate conturile"
 msgid "Send queued message(s)"
 msgstr "Trimiterea mesajului(lor) din lista de aşteptare"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Creare"
@@ -3840,7 +3840,7 @@ msgstr "Răspuns toţi"
 msgid "Reply to all"
 msgstr "Răspunde la toţi"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Înaintare"
 
@@ -4122,425 +4122,438 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Deschidere fereastră de configurare cont...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Cont%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Preferinţe pentru noul cont"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 #, fuzzy
 msgid "Account preferences"
 msgstr "Preferinţe comune"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Creare fereastră de preferinţe cont...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Recepţionare"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Avansat"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Numele contului"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 #, fuzzy
 msgid "Set as default"
 msgstr " Setare drept cont curent "
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Informatii personale"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Nume complet"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "Adresa de mail"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Organizaţie"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Informatii despre server"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Nimic (local)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 #, fuzzy
 msgid "This server requires authentication"
 msgstr "a avut loc o eroare la autorizaţie\n"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "Server news"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Server pentru recepţionare"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "Server SMTP (trimitere)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "Utilizator"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Parola"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "a avut loc o eroare la autorizaţie\n"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Ştergere mesaje de pe server după primire"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 #, fuzzy
 msgid "Remove after"
 msgstr "Ştergere director"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 #, fuzzy
 msgid "days"
 msgstr "Alias"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr ""
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 #, fuzzy
 msgid "Download all messages on server"
 msgstr "Recepţionare toate mesajele de pe server"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 #, fuzzy
 msgid "Receive size limit"
 msgstr "Recepţionare"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Filtrare mesaje la primire"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 #, fuzzy
 msgid "Default inbox"
 msgstr "Ştergere"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Deschide primul mesaj necitit la intrarea într-un director"
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 #, fuzzy
 msgid "Authentication method"
 msgstr "Autentificare..."
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Automat"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Numărul maxim al articolului\n"
 "pentru recepţionare (0 = nelimitat)     "
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Destinatarul nu a fost specificat."
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Antet"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Adăugare câmp Date la antet"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Generare Message-ID"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Adăugare de câmpuri definite de utilizator"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " Editare..."
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 #, fuzzy
 msgid "Authentication"
 msgstr "Autentificare..."
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 #, fuzzy
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentificare..."
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 #, fuzzy
 msgid "Command output"
 msgstr "Commandă"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 #, fuzzy
 msgid "Automatically set the following addresses"
 msgstr "Setare automată a adreselor următoare"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 #, fuzzy
 msgid "Sign message by default"
 msgstr "Taie liniile mesajului la"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 #, fuzzy
 msgid "Encrypt message by default"
 msgstr "Taie liniile mesajului la"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 #, fuzzy
 msgid "Use clear text signature"
 msgstr "Inserare semnătură"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 #, fuzzy
 msgid "Specify key manually"
 msgstr "Nume domeniu"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 #, fuzzy
 msgid "User or key ID:"
 msgstr "Utilizator"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 #, fuzzy
 msgid "Use SSL for POP3 connection"
 msgstr "creare conexiune tunel IMAP4\n"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 #, fuzzy
 msgid "Use STARTTLS command to start SSL session"
 msgstr "salvarea mesajului este imposibilă\n"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 #, fuzzy
 msgid "Use SSL for IMAP4 connection"
 msgstr "creare conexiune tunel IMAP4\n"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 #, fuzzy
 msgid "Use SSL for NNTP connection"
 msgstr "creare conexiune tunel IMAP4\n"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 #, fuzzy
 msgid "Use SSL for SMTP connection"
 msgstr "creare conexiune tunel IMAP4\n"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "Port SMTP"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "Port POP3"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 #, fuzzy
 msgid "Specify IMAP4 port"
 msgstr "Port SMTP"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 #, fuzzy
 msgid "Specify NNTP port"
 msgstr "Port SMTP"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Nume domeniu"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 #, fuzzy
 msgid "IMAP server directory"
 msgstr "Serverul IMAP4 nu a fost introdus."
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 #, fuzzy
 msgid "Put sent messages in"
 msgstr "Salvare mesaje trimise în outbox"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 #, fuzzy
 msgid "Put draft messages in"
 msgstr "Taie liniile mesajului la"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Ştergere mesaj"
+
+#: src/prefs_account_dialog.c:1723
 #, fuzzy
 msgid "Put deleted messages in"
 msgstr "Ştergere mesaj"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 #, fuzzy
 msgid "Account name is not entered."
 msgstr "Adresa de mail nu a fost introdusă."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "Adresa de mail nu a fost introdusă."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "Serverul SMTP nu a fost introdus."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "Numele de utilizator nu a fost introdus."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "Serverul POP3 nu a fost introdus."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "Serverul IMAP4 nu a fost introdus."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "Serverul NNTP nu a fost introdus."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5543,7 +5556,7 @@ msgstr ""
 msgid "Custom header setting"
 msgstr ""
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr " Ştergere "
 
@@ -5610,223 +5623,223 @@ msgstr "Scriere configuraţia filtrului...\n"
 msgid "This header is already in the list."
 msgstr "Directorul '%s' există deja."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 #, fuzzy
 msgid "Filter setting"
 msgstr "Filtrare"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi această regulă ?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Ştergere regulă"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 #, fuzzy
 msgid "Filter rule"
 msgstr "Ştergere regulă"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 #, fuzzy
 msgid "Any header"
 msgstr "Antet"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 #, fuzzy
 msgid "Edit header..."
 msgstr "Antet"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 #, fuzzy
 msgid "Message body"
 msgstr "Mesaj"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "conţine"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 #, fuzzy
 msgid "doesn't contain"
 msgstr "nu conţine"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 #, fuzzy
 msgid "Move to"
 msgstr "Jos"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 #, fuzzy
 msgid "Copy to"
 msgstr "/_Copiere..."
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Ştergere"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 #, fuzzy
 msgid "Delete from server"
 msgstr "Ştergere director"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 #, fuzzy
 msgid "Set mark"
 msgstr "Observaţii"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 #, fuzzy
 msgid "Set color"
 msgstr "Trimitere mesaj"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 #, fuzzy
 msgid "Mark as read"
 msgstr "/_Marcare/Marcare mesaj n_ecitit"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/Înaintare ca a_taşament"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 #, fuzzy
 msgid "Redirect"
 msgstr "/Re_editare"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 #, fuzzy
 msgid "Execute command"
 msgstr "Executare"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 #, fuzzy
 msgid "folder:"
 msgstr "Director"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 #, fuzzy
 msgid "day(s)"
 msgstr "Alias"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 #, fuzzy
 msgid "address:"
 msgstr "Adresă"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 #, fuzzy
 msgid "Edit header list"
 msgstr "Antet"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 #, fuzzy
 msgid "Headers"
 msgstr "Antet"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 #, fuzzy
 msgid "Header:"
 msgstr "Antet"
 
-#: src/prefs_filter_edit.c:1679
-#, fuzzy
-msgid "Rule name is not specified."
-msgstr "Destinatarul nu a fost specificat."
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Antetul nu a fost definit."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Destinaţia nu a fost definită."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+#, fuzzy
+msgid "Rule name is not specified."
+msgstr "Destinatarul nu a fost specificat."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1823
 #, fuzzy
 msgid "Invalid action exists."
 msgstr "Lună invalidă\n"
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Antetul nu a fost definit."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: fişierul nu există\n"
@@ -6303,15 +6316,20 @@ msgstr "doar citire"
 msgid "unknown"
 msgstr "necunoscut"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "ştergere newsgroup %s ...\n"
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Lista de newsgroup-uri nu a putut fi obţinută."
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Gata."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d newsgroup-uri recepţionate (%s citite)"
@@ -7661,9 +7679,6 @@ msgstr ""
 #~ msgid "deleting folder %s ...\n"
 #~ msgstr "ştergere director %s ...\n"
 
-#~ msgid "deleting newsgroup %s ...\n"
-#~ msgstr "ştergere newsgroup %s ...\n"
-
 #~ msgid "Input adding news server:"
 #~ msgstr "Introduceţi numele noului server news:"
 
diff --git a/po/ru.po b/po/ru.po
index 905fb5dc..37002323 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.0.0beta4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+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,9 +20,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Чтение настроек учетных записей...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "ошибка записи настроек в файл\n"
@@ -46,177 +46,177 @@ msgstr "установление соединения IMAP4 с %s:%d ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "Не удалось начать сеанс TLS.\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Удаление сообщения %d"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Отправка сообщения (%d / %d байт)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Копирование сообщения %s%c%d в %s ...\n"
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Копирование сообщения %s%c%d в %s ...\n"
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Получение сообщений с %s..."
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "не удалось установить флаг удаления: %s\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "не удалось очистить папку от удаленных сообщений\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Получение сообщений с %s..."
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 msgid "can't set deleted flags: 1:*\n"
 msgstr "не удалось установить флаг удаления: 1:*\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 msgid "can't close folder\n"
 msgstr "невозможно закрыть папку\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "корневая папка %s не существует\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 msgid "error occurred while getting LIST.\n"
 msgstr "произошла ошибка при получении LIST.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Ошибка при создании '%s'\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Ошибка при создании '%s' внутри INBOX\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "не удается создать почтовый ящик: ошибка LIST\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "не удается создать почтовый ящик\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "не удается переименовать почтовый ящик %s в %s\n"
 
-#: libsylph/imap.c:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "не удается удалить почтовый ящик\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "не удалось получить данные конверта\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Отправка сообщения (%d / %d байт)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "ошибка при получении данных конверта.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ошибка при разборе данных конверта: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не удалось соединиться с сервером IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2475
+#: libsylph/imap.c:2487
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Не удалось открыть сеанс связи IMAP4 c %s:%d\n"
 
-#: libsylph/imap.c:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "не удалось получить пространство имен\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "невозможно выбрать папку: %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "ошибка при выполнении команды IMAP: CLOSE\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 msgid "IMAP4 authentication failed.\n"
 msgstr "Ошибка аутентификации IMAP4.\n"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "Ошибка авторизации IMAP4.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не удалось добавить %s к %s\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(передача файла...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "не удалось добавить сообщение к %s\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не удалось скопировать %s в %s\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "ошибка при выполнении команды IMAP: STORE %s %s\n"
 
-#: libsylph/imap.c:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "ошибка при выполнении команды IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 msgid "error while imap command: CLOSE\n"
 msgstr "ошибка при выполнении команды IMAP: CLOSE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "ошибка преобразования iconv из UTF-7 в %s\n"
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "ошибка преобразования iconv из %s в UTF-7\n"
@@ -304,30 +304,30 @@ msgstr "не удалось обрезать почтовый ящик до ну
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Экспорт сообщений из %s в %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "не удалось скопировать сообщение %s в %s\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "Не удалось открыть файл пометок.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "исходная папка совпадает с папкой назначения.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Копирование сообщения %s%c%d в %s ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Последний номер в каталоге %s = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -336,7 +336,7 @@ msgstr ""
 "Файл '%s' существует.\n"
 "Нельзя создать папку."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -358,71 +358,71 @@ msgstr "соединение NNTP с %s:%d ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "Потеряно соединение NNTP с %s:%d. Попытка восстановления...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "статья %d уже в кеше.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "получение статьи %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "ошибка чтения статьи %d\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "ошибка получения списка групп новостей\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "ошибка отправки статьи.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "ошибка получения статьи %d\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "не удалось выбрать группу: %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "неверный диапазон статей: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "новых статей нет.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "загрузка xover %d - %d в %s...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "не удалось загрузить xover\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "произошла ошибка при получении xover.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "неверная строка xover: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "не удалось загрузить xhdr\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "произошла ошибка при получении xhdr.\n"
 
@@ -517,16 +517,16 @@ msgstr "папку:"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Ошибка преобразования кодировки.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "ошибка открытия файла пометок\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "не удалось получить сообщение %d\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Неправильная команда печати: '%s'\n"
@@ -716,12 +716,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Имя"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Протокол"
 
@@ -729,7 +729,7 @@ msgstr "Протокол"
 msgid "Server"
 msgstr "Сервер"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Изменить"
 
@@ -743,7 +743,7 @@ msgstr " Установить учетную запись по умолчани�
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Вы действительно хотите удалить эту запись?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Без названия"
@@ -995,7 +995,7 @@ msgstr "Адрес E-Mail"
 msgid "Address book"
 msgstr "Адресная книга"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Имя:"
 
@@ -1010,7 +1010,7 @@ msgstr "Удалить"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Добавить"
 
@@ -1183,7 +1183,7 @@ msgid "Group"
 msgstr "Группа"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Папка"
 
@@ -1728,12 +1728,12 @@ msgid "MIME type"
 msgstr "Тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Отправить"
@@ -1775,7 +1775,7 @@ msgid "Attach file"
 msgstr "Вложить файл"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Подпись"
@@ -1988,7 +1988,7 @@ msgid " Check File "
 msgstr " Проверить файл "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Файл"
 
@@ -2066,7 +2066,7 @@ msgid "Edit JPilot Entry"
 msgstr "Редактирование записи JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2131,7 +2131,7 @@ msgstr "Тайм-аут (сек)"
 msgid "Maximum Entries"
 msgstr "Максимальный размер результата"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Основные"
 
@@ -2189,7 +2189,7 @@ msgid "Exporting file:"
 msgstr "Экспортировать в файл:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr " Выбор... "
 
@@ -3654,7 +3654,7 @@ msgstr "Получить сообщения со всех учетных зап�
 msgid "Send queued message(s)"
 msgstr "Послать сообщения из очереди"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Написать"
@@ -3679,7 +3679,7 @@ msgstr "Ответить всем"
 msgid "Reply to all"
 msgstr "Ответить всем"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Переслать"
 
@@ -3962,218 +3962,218 @@ msgstr ""
 "Неверно! Повторите...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Открытие окна настроек учетной записи...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Учетная запись %d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Настройки новой учетной записи"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Настройки учетной записи"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Создание окна настроек учетной записи...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Прием"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Защита"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Дополнительные"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Имя учетной записи"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "По умолчанию"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Личная информация"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Полное имя"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "Адрес E-Mail"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Организация"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Сведения о серверах"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "Новостной (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Нет (локальный)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Этот сервер требует аутентификации"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "Сервер новостей"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Сервер для приема"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "Сервер SMTP (отправка)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "ID пользователя"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Пароль"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 msgid "Use secure authentication (APOP)"
 msgstr "Использовать безопасную аутентификацию (APOP)"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Удалять сообщения с сервера после приема"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "Удалить через"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "дней"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 дней: удалить немедленно)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Принимать все сообщения с сервера"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "Ограничить размер принимаемых сообщений"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr "кб"
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Фильтровать сообщения при приеме"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Папка для входящих сообщений"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Неотфильтрованные сообщения будут сохранены в этой папке)"
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "Метод аутентификации"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Автоматически"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "Новости"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Наибольшее число статей для загрузки\n"
 "(не ограничено, если указан 0)"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Получатель сообщения не указан."
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "Проверять по команде 'Получить все'"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Заголовок"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Добавить в заголовок поле Date"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Создавать Message-ID"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Добавить дополнительные заголовки"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " Определить... "
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Аутентификация"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Аутентификация SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4182,178 +4182,191 @@ msgstr ""
 "Если оставить эти поля пустыми, будут использоваться\n"
 "имя пользователя и пароль, заданные для приема почты."
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Проверка пароля через POP3 перед отправкой"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 msgid "Command output"
 msgstr "Вывод команды"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Автоматически устанавливать адреса"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Копия"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Скрытно"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Обратный адрес"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Подписывать сообщения по умолчанию"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "Шифровать сообщения по умолчанию"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "Использовать ASCII-кодирование при шифровании"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "Использовать открытую текстовую подпись"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Ключ подписи"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Ключ GnuPG по умолчанию"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Ключ для выбранного адреса E-mail"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Другой ключ"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "ID пользователя ключа:"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "Не использовать SSL"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "Использовать SSL для соединения POP3"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Использовать команду STARTTLS для начала сеанса SSL"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "Использовать SSL для соединения IMAP4"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "Использовать SSL для соединения NNTP"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Отправка (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "Использовать SSL для соединения SMTP"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr "Использовать неблокирующий режим SSL"
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(Выключите эту опцию, если возникают проблемы при использовании SSL)"
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "Порт SMTP"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "Порт POP3"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "Порт IMAP4"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "Порт NNTP"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Имя домена"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "Каталог сервера IMAP4"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "Сохранять отправленные сообщения в"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "Сохранять черновики в"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Сохранять удаленные сообщения в"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "Сохранять удаленные сообщения в"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "Не указано имя учетной записи."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "Не указан адрес."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "Не указан сервер SMTP."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "Не указан идентификатор пользователя."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "Не указан сервер POP3."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "Не указан сервер IMAP4."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "Не указан сервер NNTP."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5356,7 +5369,7 @@ msgstr "Старая Sylpheed"
 msgid "Custom header setting"
 msgstr "Настройка дополнительных заголовков"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr "Удалить"
 
@@ -5412,198 +5425,198 @@ msgstr "Запись конфигурации отображения загол�
 msgid "This header is already in the list."
 msgstr "Этот заголовок уже присутствует в списке."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Настройка фильтров"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr "Вкл."
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Вы хотите удалить правило?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Удаление правила"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 msgid "Filter rule"
 msgstr "Правило фильтрации"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr "Если любое из следующих условий выполняется:"
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr "Если все следующие условия выполняются:"
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr "Выполнить следующие действия:"
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr "To или Cc"
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 msgid "Any header"
 msgstr "Любой заголовок"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 msgid "Edit header..."
 msgstr "Изменить заголовки..."
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 msgid "Message body"
 msgstr "Тело сообщения"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr "Результат команды"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr "Возраст сообщения"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "содержит"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 msgid "doesn't contain"
 msgstr "не содержит"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr "совпадает с"
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr "не совпадает с"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr "соответствует regex"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr "не соответствует regex"
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr "больше, чем"
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr "меньше, чем"
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr "больше, чем"
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr "меньше, чем"
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 msgid "Move to"
 msgstr "Переместить в"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 msgid "Copy to"
 msgstr "Копировать в"
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Не принимать"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 msgid "Delete from server"
 msgstr "Удалить с сервера"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 msgid "Set mark"
 msgstr "Отметить"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 msgid "Set color"
 msgstr "Установить цвет"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 msgid "Mark as read"
 msgstr "Пометить как прочитанное"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 msgid "Forward as attachment"
 msgstr "Переслать как вложение"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 msgid "Redirect"
 msgstr "Перенаправить без изменений"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 msgid "Execute command"
 msgstr "Выполнить команду"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr "Прекратить обработку правил"
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 msgid "folder:"
 msgstr "папку:"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 #, fuzzy
 msgid "day(s)"
 msgstr "дней"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 msgid "address:"
 msgstr "адрес:"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 msgid "Edit header list"
 msgstr "Список заголовков"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 msgid "Headers"
 msgstr "Заголовки"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 msgid "Header:"
 msgstr "Заголовок:"
 
-#: src/prefs_filter_edit.c:1679
-msgid "Rule name is not specified."
-msgstr "Не указано имя правила."
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 msgid "Command is not specified."
 msgstr "Не указана командная строка."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr "Указано недопустимое условие."
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 msgid "Destination folder is not specified."
 msgstr "Папка назначения не указана."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+msgid "Rule name is not specified."
+msgstr "Не указано имя правила."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr "Указано недопустимое условие."
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr "Указано недопустимое действие."
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 msgid "Condition not exist."
 msgstr "Не указано условие."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 msgid "Action not exist."
 msgstr "Не указано действие."
 
@@ -6049,15 +6062,20 @@ msgstr "только чтение"
 msgid "unknown"
 msgstr "неизвестный"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "Не удалось получить список групп новостей."
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Не удалось получить список групп новостей."
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Выполнено."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d групп новостей (%s загружено)"
diff --git a/po/sk.po b/po/sk.po
index d478922e..ae4b9461 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+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,9 +20,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Načítavam nastavenia pre všetky kontá...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "nepodarilo sa zapísať nastavenie do súboru\n"
@@ -46,177 +46,177 @@ msgstr "vytváram IMAP4 spojenie k %s:%d ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "Nedá sa vytvoriť TLS spojenie.\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Odstraňujem správu %d"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Kopírujem správu %s%c%d do %s ...\n"
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopírujem správu %s%c%d do %s ...\n"
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Prijímam správy z %s..."
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nedá sa nastaviť príznak zmazania: %s\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "nedá sa odstrániť\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Prijímam správy z %s..."
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nedá sa nastaviť príznak zmazania: 1:*\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 msgid "can't close folder\n"
 msgstr "priečinok sa nedá zatvoriť\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "koreňový priečinok %s neexistuje\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 msgid "error occurred while getting LIST.\n"
 msgstr "pri príkaze LIST sa vyskytla chyba.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Nedá sa vytvoriť '%s'\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Nedá sa vytvoriť '%s' v INBOXe\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nedá sa vytvoriť schránka: príkaz LIST zlyhal\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "nedá sa vytvoriť schránka\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nedá sa premenovať schránka: %s na %s\n"
 
-#: libsylph/imap.c:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "schránka sa nedá odstrániť \n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "obálka sa nedá načítať\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "pri získavaní obálky sa vyskytla chyba.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "obálka sa nedá prečítať: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, 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:2475
+#: libsylph/imap.c:2487
 #, 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:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "nedá sa nájsť obálka\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "priečinok sa nedá vytvoriť: %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "chyba pri IMAP príkaze: CLOSE\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 autentizácia bola neúspešná.\n"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "neúspešné prihlásenie k IMAP4.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nedá sa napojiť %s k %s\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(posielam súbor...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nedá sa napojiť správa k %s\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nedá sa kopírovať %s do %s\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "chyba pri IMAP príkaze: STORE %s %s\n"
 
-#: libsylph/imap.c:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "chyba pri IMAP príkaze: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 msgid "error while imap command: CLOSE\n"
 msgstr "chyba pri IMAP príkaze: CLOSE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nemôže skonvertovať UTF-7 na %s\n"
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nemôže skonvertovať %s na UTF-7\n"
@@ -303,30 +303,30 @@ msgstr "nemôžem skrátiť mailbox na nulovú dĺžku.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportujem správy z %s do %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "nemôžem kopírovať správu %s do %s\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "Nemôžem označiť súbor so značkami.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "zdrojový priečinok je ten istý ako cieľový.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopírujem správu %s%c%d do %s ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Posledné číslo v priečinku %s = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -335,7 +335,7 @@ msgstr ""
 "Súbor '%s' už existuje.\n"
 "Priečinok sa nedá vytvoriť."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -357,71 +357,71 @@ msgstr "nadväzujem NNTP spojenie k %s:%d ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP spojenie k %s:%d bolo prerušené. Obnovujem spojenie...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "článok %d už je v medzipamäti.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "prijímam článok %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "nemôžem prečítať článok %d\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "nemôžem získať zoznam diskusných skupín\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "nemôžem odoslať článok.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "nemôžem prijať článok %d\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "nemôžem vybrať skupinu %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neplatný rozsah článkov: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "žiadne nové články.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "prijímam xover %d - %d v %s...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "nemôžem prijať xover\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "pri prijímaní xover sa vyskytla chyba.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "neplatný xover riadok: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "nemôžem prijať xhdr\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "pri prijímaní xhdr sa vyskytla chyba.\n"
 
@@ -517,16 +517,16 @@ msgstr "Priečinok"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Nepodarilo sa skonvertovať kód.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "nemôžem otvoriť súbor so značkami\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nedá sa prijať správa %d\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Príkazový riadok tlače je neplatný: '%s'\n"
@@ -714,12 +714,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Meno"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -727,7 +727,7 @@ msgstr "Protokol"
 msgid "Server"
 msgstr "Server"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Upraviť"
 
@@ -741,7 +741,7 @@ msgstr "Nastaviť ako východzie konto"
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Naozaj chcete zmazať toto konto?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Bez názvu"
@@ -993,7 +993,7 @@ msgstr "E-mailová adresa"
 msgid "Address book"
 msgstr "Otvoriť adresár"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Meno:"
 
@@ -1008,7 +1008,7 @@ msgstr "Zmazať"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Pridať"
 
@@ -1182,7 +1182,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Priečinok"
 
@@ -1735,12 +1735,12 @@ msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Odoslať"
@@ -1782,7 +1782,7 @@ msgid "Attach file"
 msgstr "Pripojiť súbor"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Podpis"
@@ -1995,7 +1995,7 @@ msgid " Check File "
 msgstr "Testovať súbor"
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Súbor"
 
@@ -2074,7 +2074,7 @@ msgid "Edit JPilot Entry"
 msgstr "Upraviť záznam JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2139,7 +2139,7 @@ msgstr "Timeout (v sekundách)"
 msgid "Maximum Entries"
 msgstr "Maximum záznamov"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Základné"
 
@@ -2197,7 +2197,7 @@ msgid "Exporting file:"
 msgstr "Exportovaný súbor:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr "Zvoľte..."
 
@@ -3681,7 +3681,7 @@ msgstr "Prijať novú poštu pre všetky kontá"
 msgid "Send queued message(s)"
 msgstr "Odoslať správy vo fronte"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Nová správa"
@@ -3706,7 +3706,7 @@ msgstr "Odp. všetkým"
 msgid "Reply to all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Poslať ďalej"
 
@@ -3988,219 +3988,219 @@ msgstr ""
 "Neplatné heslo! Skúste znova...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Otváram okno nastavenia konta...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Nastavenie nového konta"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Nastavenie konta"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Vytváram okno nastavenia konta...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Prijať"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Súkromie"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Rozšírené"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Názov tohto konta"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "Nastaviť ako východzie"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Osobné informácie"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Celé meno"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "E-mailová adresa"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Organizácia"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Informácie o serveri"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Žiadne (lokálne)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentizáciu"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "News server"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Server pre prijímanie"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "SMTP server (odosielanie)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "Prihlasovacie meno"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Heslo"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Tento server vyžaduje autentizáciu"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Vymazať správy na serveri po ich prijatí"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "Vymazať po"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "dňoch"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 dní: zmazať ihneď)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Prijať všetky správy na serveri"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "Obmedzenie veľkosti správy pre príjem"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Filtrovať správy pri prijatí"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Východzí inbox"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nefiltrované správy budú umiestnené v tomto priečinku)"
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "Metóda autentizácie"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Automatická"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "Diskusné skupiny"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maximálny počet príspevkov na stiahnutie\n"
 "(0 pre neobmedzený počet)"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Nie je určený príjemca."
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "Pri voľbe 'Prijať všetko' prijať správy aj pre toto konto"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Hlavička"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Pridať dátum do hlavičky"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Generovať Message-ID"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Pridať uživateľom definované hlavičky"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " Upresniť... "
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Autentizácia"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Autentizácia (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4209,178 +4209,191 @@ msgstr ""
 "Ak necháte tieto polia prázdne, bude použité to isté\n"
 "prihlasovacie meno a heslo ako pri prijímaní."
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentizovať cez POP3 pred odosielaním"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 msgid "Command output"
 msgstr "Výstup príkazu"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Kópia"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Slepá kópia"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Odpovedať komu"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Implicitne podpísať správu"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "Implicitne zašifrovať správu"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "Šifrovať do ASCII-armored tvaru"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "Podpísať čistým textom"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Kľúč pre podpis"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Použiť východzí kľúč GnuPG"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Zvoliť kľúč podľa vašej emailovej adresy"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Zadať kľúč ručne"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "User alebo key ID:"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "Nepoužívať SSL"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "Použiť SSL pre POP3 spojenie"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Použiť príkaz STARTTLS pre nadviazanie SSL spojenia"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "Použiť SSL pre IMAP4 spojenie"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "Použiť SSL pre NNTP spojenie"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Odoslať (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "Použiť SSL pre SMTP spojenie"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr "Používať non-blocking SSL"
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(Vypnite túto voľbu ak máte problémy pri SSL spojeniach)"
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "Určiť SMTP port"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "Určiť POP3 port"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "Určiť IMAP4 port"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "Určiť NNTP port"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Určiť názov domény"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "Priečinok serveru IMAP"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "Uložiť odoslané správy do"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "Uložiť koncepty do"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Uložiť vymazané správy do"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "Uložiť vymazané správy do"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "Nebol zadaný názov konta."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "Nebola zadaná e-mailová adresa."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "Nebol zadaný SMTP server."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "Nebol zadaný user ID."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "Nebol zadaný POP3 server."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "Nebol zadaný IMAP4 server."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "Nebol zadaný NNTP server."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5383,7 +5396,7 @@ msgstr "Starší Sylpheed"
 msgid "Custom header setting"
 msgstr "Nastavenie vlastných hlavičiek"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr "Zmazať"
 
@@ -5439,221 +5452,221 @@ msgstr "Zapisujem nastavenie zobrazovania hlavičiek...\n"
 msgid "This header is already in the list."
 msgstr "Táto hlavička už je v zozname."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Nastavenie filtra"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Naozaj chcete zmazať toto pravidlo?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Zmazať pravidlo"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 #, fuzzy
 msgid "Filter rule"
 msgstr "Zmazať pravidlo"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 #, fuzzy
 msgid "Any header"
 msgstr "Skryté hlavičky"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 #, fuzzy
 msgid "Edit header..."
 msgstr "Hlavička"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 #, fuzzy
 msgid "Message body"
 msgstr "Správa"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "obsahuje"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 #, fuzzy
 msgid "doesn't contain"
 msgstr "neobsahuje"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 #, fuzzy
 msgid "Move to"
 msgstr "Posunúť nadol"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 #, fuzzy
 msgid "Copy to"
 msgstr "/_Kopírovať..."
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Neprijať"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 #, fuzzy
 msgid "Delete from server"
 msgstr "Odstrániť priečinok"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 #, fuzzy
 msgid "Set mark"
 msgstr "Poznámky"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 #, fuzzy
 msgid "Set color"
 msgstr "Nastaviť farby správy"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 #, fuzzy
 msgid "Mark as read"
 msgstr "/Oz_načiť/Označiť ako _prečítané"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/Poslať ďalej ako p_rílohu"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 #, fuzzy
 msgid "Redirect"
 msgstr "/Pr_esmerovať"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 #, fuzzy
 msgid "Execute command"
 msgstr "Vykonať"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 #, fuzzy
 msgid "folder:"
 msgstr "Priečinok"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 #, fuzzy
 msgid "day(s)"
 msgstr "dňoch"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 #, fuzzy
 msgid "address:"
 msgstr "Adresár"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 #, fuzzy
 msgid "Edit header list"
 msgstr "Hlavička"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 #, fuzzy
 msgid "Headers"
 msgstr "Hlavička"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 #, fuzzy
 msgid "Header:"
 msgstr "Hlavička"
 
-#: src/prefs_filter_edit.c:1679
-#, fuzzy
-msgid "Rule name is not specified."
-msgstr "Nie je určený príjemca."
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Nebol zadaný príkazový riadok."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Nebol zadaný cieľ."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+#, fuzzy
+msgid "Rule name is not specified."
+msgstr "Nie je určený príjemca."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Nebol zadaný príkazový riadok."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: súbor neexistuje\n"
@@ -6100,15 +6113,20 @@ msgstr "len na čítanie"
 msgid "unknown"
 msgstr "neznáma"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "Nedá sa získať zoznam diskusných skupín."
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Nedá sa získať zoznam diskusných skupín."
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Hotovo."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "Prijatých %d diskusných skupín (prečítaných %s)"
diff --git a/po/sl.po b/po/sl.po
index 085a2d72..62faa00d 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+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,9 +18,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Berem vse nastavitve za vsak račun...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "neuspešen poskus zapisa konfiguracije v datoteko\n"
@@ -44,182 +44,182 @@ msgstr "delam povezavo IMAP4 do %s:%d ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "Ne morem pričeti seje TLS.\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Brišem sporočilo %d"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Pošiljam sporočilo (%d / %d zlogov)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Prestavljam sporočilo %s%c%d v %s ...\n"
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiram sporočilo %s%c%d v %s ...\n"
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ne morem nastaviti izbrisanih zastavic: %d\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "ne morem izbrisati\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ne morem nastaviti izbrisanih zastavic: 1:%d\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ne morem izbrati mape: %s\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Datoteka z oznakami ni bila najdena.\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "med dobivanjem LIST je prišlo do napake.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Ne morem narediti '%s'\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Ne morem narediti '%s' pod mapo Prejeto\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ne morem narediti poštnega predala: LIST ni uspel\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "ne morem narediti poštnega predala\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, 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:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "ne morem izbrisati poštnega predala\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "ne morem dobiti ovojnice\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Pošiljam sporočilo (%d / %d zlogov)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "med dobivanjem ovojnice je prišlo do napake.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ne morem razčleniti ovojnice: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, 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:2475
+#: libsylph/imap.c:2487
 #, 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:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "ne morem dobiti imenskega prostora\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne morem izbrati mape: %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Overovitvena metoda"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "Prijava na IMAP4 ni uspela.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne morem pripeti %s na %s\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(pošiljam datoteko...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne morem dodati sporočila %s\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne morem kopirati %d na %s\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, 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:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne more pretvoriti UTF-7 v %s\n"
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne more pretvoriti %s v UTF-7\n"
@@ -306,30 +306,30 @@ msgstr "ne morem prisekati poštnega predala na ničlo.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Izvažam sporočila iz %s v %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ne morem prepisati sporočila %s v %s\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "Ne morem odpreti označene datoteke.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "Izvorna mapa je identična ciljni.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopiram sporočilo %s%c%d v %s ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Zadnja številka v imeniku %s = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -338,7 +338,7 @@ msgstr ""
 "Datoteka `%s' že obstaja.\n"
 "Ne morem narediti imenika."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -360,71 +360,71 @@ msgstr "ustvarjam povezavo NNTP do %s:%d ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "Povezava NNTP do %s:%d je bila prekinjena. Povezujem se znova...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "članek %d je že v predpomnilniku.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "sprejemam članek %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "ne morem prebrati članka %d\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "ne morem sprejeti seznama novičarskih skupin\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "ne morem poslati članka.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "ne morem sprejeti članka %d\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "ne morem izbrati skupine %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neveljavno območje člankov: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "ni novih člankov.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "sprejemam xover %d - %d v %s...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "ne morem prejeti xoverja\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "med prejemanjem xoverja je prišlo do napake.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "neveljavna vrstica xover: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "ne morem prejeti xhdr-ja\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "med prejemanjem xhdr-ja je prišlo do napake.\n"
 
@@ -522,16 +522,16 @@ msgstr "Mapa"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Pretvorba kodiranja ni uspela.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "Ne morem odpreti datoteke z oznakami.\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ne morem prenesti sporočila %d\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za tiskanje ni veljavna: `%s'\n"
@@ -722,12 +722,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Ime"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -735,7 +735,7 @@ msgstr "Protokol"
 msgid "Server"
 msgstr "Strežnik"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Urejanje"
 
@@ -749,7 +749,7 @@ msgstr " Nastavi kot privzet račun "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Ali resnično želite izbrisati ta račun?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Brez naslova"
@@ -999,7 +999,7 @@ msgstr "Elektronski naslov"
 msgid "Address book"
 msgstr "Imenik naslovov"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Ime:"
 
@@ -1014,7 +1014,7 @@ msgstr "Izbriši"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Dodajanje"
 
@@ -1187,7 +1187,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Mapa"
 
@@ -1740,12 +1740,12 @@ msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Pošlji"
@@ -1787,7 +1787,7 @@ msgid "Attach file"
 msgstr "Pripni datoteko"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Podpis"
@@ -2001,7 +2001,7 @@ msgid " Check File "
 msgstr " Preveri Datoteko "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Datoteka"
 
@@ -2079,7 +2079,7 @@ msgid "Edit JPilot Entry"
 msgstr "Urejanje vnosa JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2144,7 +2144,7 @@ msgstr "Čas izteka (sek.)"
 msgid "Maximum Entries"
 msgstr "Največje št. vnosov"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Osnovno"
 
@@ -2201,7 +2201,7 @@ msgid "Exporting file:"
 msgstr "Izvozi datoteko:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr " Izberi... "
 
@@ -3685,7 +3685,7 @@ msgstr "Pripoji novo pošto z vseh računov"
 msgid "Send queued message(s)"
 msgstr "Pošlji čakajoča sporočila"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Sestavi"
@@ -3710,7 +3710,7 @@ msgstr "Odgovori vsem"
 msgid "Reply to all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Posreduj"
 
@@ -3992,219 +3992,219 @@ msgstr ""
 "Napačna šifrirna fraza! Poskusite znova...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Odpiram okno za nastavitve računa...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Račun%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Nastavitve novega računa"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Nastavitve računa"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Ustvarjam okno za nastavitve računa...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Sprejmi"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Zasebnost"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Ime tega računa"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "Nastavi kot privzeto"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Osebni podatki"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Polno ime"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "Poštni naslov"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Organizacija"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Podatki o strežniku"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "Novice (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Noben (lokalen)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Ta strežnik zahteva overovitev"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "Novičarski strežnik"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Strežnik za sprejemanje"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "Strežnik SMTP (pošiljanje)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "Uporabniško ime"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Geslo"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Ta strežnik zahteva overovitev"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Ob sprejemu odstrani sporočila s strežnika"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "Odstrani po"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "dneh"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 dnevih: odstrani nemudoma)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Naloži vsa sporočila na strežniku"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "Omejitev dolžine pri sprejemanju"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Filtriranje sporočil ob sprejemu"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Privzeta mapa za prejeto pošto"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nefiltrirana sporočila bodo shranjena v tej mapi)"
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "Overovitvena metoda"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "Novice"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Največje število člankov za nalaganje\n"
 "(neomejeno, če podate 0)"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Naslovnik ni določen."
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Poberi vsa' preveri novo pošto na tem računu"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Zaglavje"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Dodaj polje z datumom v zaglavje"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Generiran ID sporočila"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Dodaj uporabniško definirano zaglavje"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " Uredi... "
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Overovitev"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Avtentikacija SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4213,178 +4213,191 @@ msgstr ""
 "Če pustite te vnose prazne, bosta uporabljena\n"
 "isti uporabnški ID in geslo kot pri sprejemu."
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Pred pošiljanjem avtenticiraj s POP3"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 #, fuzzy
 msgid "Command output"
 msgstr "Ukaz"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Samodejno nastavi sledeče naslove"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Kp:"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Skp:"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Odgovor za"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Privzeto podpiši sporočilo"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "privzeto zakodiraj sporočio"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "Uporabi oklopljen zapis ASCII za enkripcijo"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "Uporabi jasen tekstovni podpis"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Ključ za podpisovanje"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Uporabi privzet ključ GnuPG"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Izberi ključ glede na vaš el. naslov"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Ročno določi ključ"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "Uporabnik ali ID ključa"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "Ne uporabljaj SSL"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "Uporabi SSL za povezavo POP3"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Uporabi ukaz STARTTLS za pričetek seje SSL"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "Uporabi SSL za povezavo IMAP4"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "Uporabi SSL za povezavo NNTP"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Pošlji (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "Uporabi SSL za povezavo SMTP"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "Vnesite vrata SMTP"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "Vnesite vrata POP3"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "Vnesite vrata IMAP4"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "Vnesite vrata NNTP"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Vnesite ime domene"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "Imenik strežnika IMAP"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "Postavi poslana sporočila v"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "Postavi osnutke sporočil v"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Postavi izbrisana sporočila v"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "Postavi izbrisana sporočila v"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "Ime računa ni vnešeno."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "Elektronski naslov ni naveden."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "Strežnik SMTP ni naveden."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "Uporabnikov ID ni vnešen."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "Strežnik POP3 ni vnešen."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "Strežnik IMAP4 ni naveden."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "Strežnik NNTP ni naveden."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5386,7 +5399,7 @@ msgstr "Stari Sylpheed"
 msgid "Custom header setting"
 msgstr "Nastavitev prikrojenega zaglavja"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr " Brisanje "
 
@@ -5442,221 +5455,221 @@ msgstr "Pišem nastavitve za prikaz zaglavij...\n"
 msgid "This header is already in the list."
 msgstr "To zaglavje je že na seznamu."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Nastavitev filtra"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Ali res želite izbrisati to pravilo?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Izbriši pravilo"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 #, fuzzy
 msgid "Filter rule"
 msgstr "Izbriši pravilo"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 #, fuzzy
 msgid "Any header"
 msgstr "Skrita zaglavja"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 #, fuzzy
 msgid "Edit header..."
 msgstr "Zaglavje"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 #, fuzzy
 msgid "Message body"
 msgstr "Sporočila"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "vsebuje"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 #, fuzzy
 msgid "doesn't contain"
 msgstr "ne vsebuje"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 #, fuzzy
 msgid "Move to"
 msgstr "Premakni navzdol"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 #, fuzzy
 msgid "Copy to"
 msgstr "/Prepiš_i..."
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Ne sprejmi"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 #, fuzzy
 msgid "Delete from server"
 msgstr "Izbriši mapo"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 #, fuzzy
 msgid "Set mark"
 msgstr "Opombe"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 #, fuzzy
 msgid "Set color"
 msgstr "Nastavi barve sporočila"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 #, fuzzy
 msgid "Mark as read"
 msgstr "/_Oznaka/Označi kot _prebrano"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/Posreduj kot prilo_go"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 #, fuzzy
 msgid "Redirect"
 msgstr "/Pre_usmeri"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 #, fuzzy
 msgid "Execute command"
 msgstr "Izvedi"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 #, fuzzy
 msgid "folder:"
 msgstr "Mapa"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 #, fuzzy
 msgid "day(s)"
 msgstr "dneh"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 #, fuzzy
 msgid "address:"
 msgstr "Naslov"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 #, fuzzy
 msgid "Edit header list"
 msgstr "Zaglavje"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 #, fuzzy
 msgid "Headers"
 msgstr "Zaglavje"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 #, fuzzy
 msgid "Header:"
 msgstr "Zaglavje"
 
-#: src/prefs_filter_edit.c:1679
-#, fuzzy
-msgid "Rule name is not specified."
-msgstr "Naslovnik ni določen."
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Ukazna vrstica ni nastavljena."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Cilj ni nastavljen."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+#, fuzzy
+msgid "Rule name is not specified."
+msgstr "Naslovnik ni določen."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Ukazna vrstica ni nastavljena."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: datoteka ne obstaja\n"
@@ -6102,15 +6115,20 @@ msgstr "samo za branje"
 msgid "unknown"
 msgstr "neznano"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "Ne morem potegniti seznama novičarskih skupin."
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Ne morem potegniti seznama novičarskih skupin."
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Opravljeno."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d sprejetih novičarskih skupin (%s prebranih)"
diff --git a/po/sr.po b/po/sr.po
index 10e49bea..5bbde4db 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -19,9 +19,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Čitanje konfiguracije za svaki nalog...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "neuspeh pri pisanju konfiguracije u datoteku\n"
@@ -45,182 +45,182 @@ msgstr "ostvarujem IMAP4 vezu prema %s:%d ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "Ne mogu pokrenuti TLS sesiju.\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Brišem poruke %d"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Šaljem poruku (%d / %d bajtova)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Pomeram poruke %s%c%d u %s ...\n"
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ne mogu postaviti obrisane oznake: %d\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "ne mogu obrisati\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ne mogu postaviti obrisane oznake: 1:%d\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ne mogu odabrati direktorijum: %s\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Označena datoteka ne postoji.\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "došlo je do greške prilikom dohvatanja LISTe.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "ne mogu kreirati '%s'\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "ne mogu kreirati '%s' ispod INBOX\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ne mogu kreirati sanduče: LIST nije uspeo\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "ne mogu kreirati sanduče\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, 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:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "ne mogu obrisati sanduče\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "ne mogu dobiti omot\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Šaljem poruku (%d / %d bajtova)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "došlo je do greške prilikom dobijanja omota.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ne mogu analizirati omot: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, 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:2475
+#: libsylph/imap.c:2487
 #, 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:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "ne mogu dobiti namespace\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne mogu odabrati direktorijum: %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Način provere identieta"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login nije uspeo.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne mogu dodati %s na %s\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(šaljem datoteku...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne mogu dodati poruku %s\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne mogu kopirati %d u %s\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, 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:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, 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:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne može prebaciti %s to UTF-7\n"
@@ -307,30 +307,30 @@ msgstr "ne mogu skratiti sanduče na nulu.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Izvozim poruke iz %s u %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ne mogu kopirati poruku %s u %s\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "Ne mogu otvoriti označenu datoteku.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "izvorni direktorijum jednak je destinaciji.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Posednji broj u direktoriju %s = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -339,7 +339,7 @@ msgstr ""
 "Datoteka `%s' već postoji.\n"
 "Ne mogu napraviti direktorijum."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -361,71 +361,71 @@ msgstr "uspostavljam NNTP vezu sa %s:%d ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP veza sa %s:%d je prekinuta. Povezujem se ponovo...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "članak %d već je pohranjen.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "primam članak %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "ne mogu pročitati članak %d\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "ne mogu primiti listu news grupa\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "ne mogu poslati članak.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "ne mogu primiti članak %d\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "ne mogu odabrati grupu %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "pogrešan opseg članaka: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "nema novih članaka.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "primam xover %d - %d u %s...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "ne mogu primiti xover\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "došlo je do greške prilikom primanja xovera.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "pogrešna xover linija: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "ne mogu dobiti xhdr\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "došlo je do greške prilikom primanja xhdra.\n"
 
@@ -523,16 +523,16 @@ msgstr "Direktorijum"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Promena koda nije uspjela.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "ne mogu otvoriti obeleženu datoteku\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ne mogu dohvatiti poruku %d\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Naredba za štampanje nije dobra: `%s'\n"
@@ -722,12 +722,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Ime"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -735,7 +735,7 @@ msgstr "Protokol"
 msgid "Server"
 msgstr "Server"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Izmeni"
 
@@ -749,7 +749,7 @@ msgstr "Postavi kao uobičajeni nalog "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Želite li zaista obrisati ovaj nalog?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Neimenovano"
@@ -999,7 +999,7 @@ msgstr "Adresa e-pošte"
 msgid "Address book"
 msgstr "Adresar"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Ime:"
 
@@ -1014,7 +1014,7 @@ msgstr "Obriši"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Dodaj"
 
@@ -1181,7 +1181,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Direktorijum"
 
@@ -1735,12 +1735,12 @@ msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Pošalji"
@@ -1782,7 +1782,7 @@ msgid "Attach file"
 msgstr "Prikači datoteku"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Potpis"
@@ -1996,7 +1996,7 @@ msgid " Check File "
 msgstr " Proveri datoteku "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Datoteka"
 
@@ -2074,7 +2074,7 @@ msgid "Edit JPilot Entry"
 msgstr "Izmenite JPilot unos"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2139,7 +2139,7 @@ msgstr "Timeout (sek)"
 msgid "Maximum Entries"
 msgstr "Max. Unos"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Osnovno"
 
@@ -2196,7 +2196,7 @@ msgid "Exporting file:"
 msgstr "Izvozim datoteku:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr " Odaberite... "
 
@@ -3681,7 +3681,7 @@ msgstr "Prima novu poštu sa svih naloga"
 msgid "Send queued message(s)"
 msgstr "Šalje odložene poruku/e"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Napiši"
@@ -3706,7 +3706,7 @@ msgstr "Odgovori na sve"
 msgid "Reply to all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Prosledi"
 
@@ -3988,219 +3988,219 @@ msgstr ""
 "Pogrešna lozinka! Pokušajte ponovo...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Otvaram prozor za svojstva naloga...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Nalog%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Podešavanja za novi nalog"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Podešavanje naloga"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Stvaranje prozora za podešavanje naloga...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Primanje"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Privatnost"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Ime ovog naloga"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "Postavi kao uobičajeni"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Lične informacije"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Puno ime"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Organizacija"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Informacije o serveru"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Ništa (lokalno)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Ovaj server zahteva proveru identiteta"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "News server"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Server za primanje"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "SMTP server (slanje)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "ID korisnika"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Lozinka"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Ovaj server zahteva proveru identiteta"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Ukloni poruke sa servera nakon primanja"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "Ukloni posle"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "dana"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 dana: odmah ukloni)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Preuzmi sve poruke sa servera"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "Ograničenje u veličini za primanje"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Filtriraj poruke pri primanju"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Uobičajeno sanduče"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nefiltrirane poruke biti će stavljene u ovaj direktorijum)"
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "Način provere identieta"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Automatski"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maksimalni broj članaka za preuzimanje\n"
 "(0 je za neograničeno)"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Primalac nije upisan."
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Primi sve' proverava poruke za ovaj nalog"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Zaglavlje"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Dodaj polje Datum u zaglavlje"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Generiši ID poruke"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Dodaj zaglavlje korisnika"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " Izmeni... "
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Provera identiteta"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP identifikacija (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4209,178 +4209,191 @@ msgstr ""
 "Ako ostaviš ove unose prazne, isti\n"
 "koririsnički ID i lozinka će biti korišćeni."
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Proveri identitet sa POP3 pre slanja"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 #, fuzzy
 msgid "Command output"
 msgstr "Naredba"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Automatski postavi sledeće adrese"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Odvovori-Na"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Uvek potpiši poruke"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "Uvek šifruj poruke"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "Koristi ASCII-armored format za šifrovanje"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "Koristi prazan tekst za potpis"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Ključ potpisa"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Koristi uobičajeni GnuPG ključ"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Odaberi ključ po adresi e-pošte"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Navedi neki drugi ključ"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "ID ključa ili korisnika:"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "Ne koristi SSL"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "Koristi SSL za POP3 veze"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Korsiti STARTTLS naredbu za pokretanje SSL-a"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "Koristi SSL za IMAP4 veze"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "Koristi SSL za NNTP veze"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Slanje (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "Koristi SSL za SMTP veze"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "Navedi SMTP port"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "Navedi POP3 port"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "Navedi IMAP4 port"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "Navedi NNTP port"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Navedi ime domena"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "Direktorijum IMAP servera"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "Stavi poslate poruke u"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "Stavi nedovršene poruke u"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Stavi obrisane poruke u"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "Stavi obrisane poruke u"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "Ime naloga nije upisano."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "Adresa e-pošte nije upisana."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "SMTP server nije upisan."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "ID korisnika nije upisan."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "POP3 server nije upisan."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 server nije upisan."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "NNTP server nije upisan."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5381,7 +5394,7 @@ msgstr "Stari Sylpheed"
 msgid "Custom header setting"
 msgstr "Podešavanje određenog zaglavlja"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr " Obriši "
 
@@ -5437,221 +5450,221 @@ msgstr "Pisanje konfiguraciju za prikaz zaglavlja...\n"
 msgid "This header is already in the list."
 msgstr "Ovo zaglavlje je već na listi."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Podešavanje filtera"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Zaista obrisati pravilo?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Obriši pravilo"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 #, fuzzy
 msgid "Filter rule"
 msgstr "Obriši pravilo"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 #, fuzzy
 msgid "Any header"
 msgstr "Svo zaglavlje"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 #, fuzzy
 msgid "Edit header..."
 msgstr "Zaglavlje"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 #, fuzzy
 msgid "Message body"
 msgstr "Poruka"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "sadrži"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 #, fuzzy
 msgid "doesn't contain"
 msgstr "ne sadrži"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 #, fuzzy
 msgid "Move to"
 msgstr "Pomeri dole"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 #, fuzzy
 msgid "Copy to"
 msgstr "/_Kopiranje..."
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Ne primaj"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 #, fuzzy
 msgid "Delete from server"
 msgstr "Obriši direktorijum"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 #, fuzzy
 msgid "Set mark"
 msgstr "Beleške"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 #, fuzzy
 msgid "Set color"
 msgstr "Podesi boje poruka"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 #, fuzzy
 msgid "Mark as read"
 msgstr "/_Označi/Označi kao _pročitano"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/Pro_sledi kao dodatak"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 #, fuzzy
 msgid "Redirect"
 msgstr "/Pre_usmeri"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 #, fuzzy
 msgid "Execute command"
 msgstr "Izvrši"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 #, fuzzy
 msgid "folder:"
 msgstr "Direktorijum"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 #, fuzzy
 msgid "day(s)"
 msgstr "dana"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 #, fuzzy
 msgid "address:"
 msgstr "Adresa"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 #, fuzzy
 msgid "Edit header list"
 msgstr "Zaglavlje"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 #, fuzzy
 msgid "Headers"
 msgstr "Zaglavlje"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 #, fuzzy
 msgid "Header:"
 msgstr "Zaglavlje"
 
-#: src/prefs_filter_edit.c:1679
-#, fuzzy
-msgid "Rule name is not specified."
-msgstr "Primalac nije upisan."
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Linija za neredbe nije podešena."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Odredište nije postavljeno."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+#, fuzzy
+msgid "Rule name is not specified."
+msgstr "Primalac nije upisan."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Linija za neredbe nije podešena."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: datoteka ne postoji\n"
@@ -6100,15 +6113,20 @@ msgstr "samo čitanje"
 msgid "unknown"
 msgstr "nepoznato"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "Ne mogu pronaći listu news grupa."
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Ne mogu pronaći listu news grupa."
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Gotovo."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d news grupa primljeno (%s pročitano)"
diff --git a/po/sv.po b/po/sv.po
index f809897a..7ace5b5b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+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,9 +19,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Läser all konfiguration för varje konto...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "misslyckades skriva konfiguration till fil\n"
@@ -44,176 +44,176 @@ msgstr "skapar IMAP4-förbindelse till %s:%d...\n"
 msgid "Can't start TLS session.\n"
 msgstr "Kan inte starta TLS-session.\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, c-format
 msgid "Getting message %d"
 msgstr "Hämtar meddelande %d"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Lägger till meddelande till %s (%d / %d)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Flyttar meddelande %s till %s..."
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopierar meddelanden %s till %s..."
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, c-format
 msgid "Removing messages %s"
 msgstr "Tar bort meddelanden %s"
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kan inte sätta borttaget-flaggor: %s\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "kan inte utplåna\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Tar bort alla meddelanden i %s"
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kan inte sätta borttaget-flaggor: 1:*\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 msgid "can't close folder\n"
 msgstr "kan inte stänga mapp\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "rotmapp %s finns inte\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 msgid "error occurred while getting LIST.\n"
 msgstr "fel uppstod vid hämtning av LIST.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Kan inte skapa \"%s\"\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "kan inte skapa \"%s\" under INBOX\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan inte skapa brevlåda: LIST misslyckades\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "kan inte skapa brevlåda\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, 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:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "kan inte ta bort brevlåda\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "kan inte hämta kuvert\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Hämtar meddelandehuvuden (%d / %d)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "fel uppstod vid hämtning av kuvert.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kan inte tolka kuvert: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, 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:2475
+#: libsylph/imap.c:2487
 #, 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:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "kan inte hämta namnutrymme\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan inte välja mapp: %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 msgid "error on imap command: STATUS\n"
 msgstr "fel vid imapkommando: STATUS\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4-autentisering misslyckades.\n"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-inloggning misslyckades.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan inte lägga till %s till %s\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(skickar fil...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kan inte lägga till meddelande till %s\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan inte kopiera %s till %s\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "fel vid imapkommando: STORE %s %s\n"
 
-#: libsylph/imap.c:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "fel vid imapkommando: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 msgid "error while imap command: CLOSE\n"
 msgstr "fel vid imapkommando: CLOSE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan inte konvertera UTF-7 till %s\n"
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan inte konvertera %s till UTF-7\n"
@@ -300,30 +300,30 @@ msgstr "kan inte korta av brevlåda till noll.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exporterar meddelanden från %s till %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "kan inte kopiera meddelande %s till %s\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "Kan inte öppna markeringsfil.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "ursprungsmappen är identisk med dest.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopierar meddelande %s%c%d till %s...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Sista tal i mapp %s = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -332,7 +332,7 @@ msgstr ""
 "Filen \"%s\" finns redan.\n"
 "Kan inte skapa mapp."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -361,71 +361,71 @@ msgstr "skapar NNTP-förbindelse till %s:%d ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP-förbindelse till %s:%d har avbrutits. Återuppkopplar...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "inlägget %d har redan cachats.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "hämtar inlägg %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "kan inte läsa inlägg %d\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "kan inte hämta diskussionsgruppslistan\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "kan inte posta inlägg.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "kan inte hämta inlägg %d\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "kan inte välja grupp %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "felaktigt inläggsomfång: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "inga nya inlägg.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "hämtar xover %d - %d i %s...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "kan inte hämta xover\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "fel uppstod vid hämtning av xover.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "felaktig xover-rad: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "kan inte hämta xhdr\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "fel uppstod vid hämtning av xhdr.\n"
 
@@ -519,16 +519,16 @@ msgstr "Skräppostfilter"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Kodkonvertering misslyckades.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "kan inte öppna markeringsfil\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kan inte hämta meddelande %d\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Utskriftskommando är felaktigt: \"%s\"\n"
@@ -719,12 +719,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Namn"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -732,7 +732,7 @@ msgstr "Protokoll"
 msgid "Server"
 msgstr "Server"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Redigera"
 
@@ -745,7 +745,7 @@ msgstr " _Använd som förvalt konto "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Vill du verkligen ta bort kontot '%s'?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 msgid "(Untitled)"
 msgstr "(Namnlös)"
 
@@ -996,7 +996,7 @@ msgstr "E-postadress"
 msgid "Address book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Namn:"
 
@@ -1011,7 +1011,7 @@ msgstr "Ta bort"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Lägg till"
 
@@ -1178,7 +1178,7 @@ msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Mapp"
 
@@ -1699,12 +1699,12 @@ msgid "MIME type"
 msgstr "MIME-typ"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Skicka"
@@ -1746,7 +1746,7 @@ msgid "Attach file"
 msgstr "Bifoga fil"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Signatur"
@@ -1954,7 +1954,7 @@ msgid " Check File "
 msgstr " Kontrollera fil "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Fil"
 
@@ -2032,7 +2032,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redigera JPilot-post"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2097,7 +2097,7 @@ msgstr "Väntetid (sek)"
 msgid "Maximum Entries"
 msgstr "Maximalt antal poster"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Grundläggande"
 
@@ -2154,7 +2154,7 @@ msgid "Exporting file:"
 msgstr "Exporterar fil:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr " Välj... "
 
@@ -3610,7 +3610,7 @@ msgstr "Hämta ny post från alla konton"
 msgid "Send queued message(s)"
 msgstr "Skicka köade meddelanden"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Skriv"
@@ -3635,7 +3635,7 @@ msgstr "Svara alla"
 msgid "Reply to all"
 msgstr "Svara till alla"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Vidarebefordra"
 
@@ -3914,213 +3914,213 @@ msgstr ""
 "Fel lösenfras! Försök igen...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Öppnar fönster för kontoinställningar...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Inställningar för nytt konto"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Kontoinställningar"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Skapar fönster för kontoinställningar...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Ta emot"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Integritet"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Detta kontos namn"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "Använd som förvalt konto"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Personlig information"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Fullst. namn"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "E-postadress"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Serverinformation"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "Diskussionsgrupper (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Inget (lokalt)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Denna server kräver autentisering"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "Diskussionsgruppsserver"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Server för mottagning"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "Server att skicka med (SMTP)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "Användar-ID"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Lösenord"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 msgid "Use secure authentication (APOP)"
 msgstr "Använd säker autentisering (APOP)"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Ta bort meddelanden på server när de mottagits"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "Ta bort efter"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "dagar"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 dagar: ta bort direkt)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Hämta alla meddelanden från server"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "Gräns för mottagningsstorlek"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Filtrera meddelanden vid mottagning"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Förvald inkorg"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Ofiltrerade meddelanden kommer att lagras i denna mapp"
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "Autentiseringsmetod"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "Diskussionsgrupper"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 msgid "Maximum number of articles to download"
 msgstr "Maximalt antal inlägg att hämta"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 msgid "No limit if 0 is specified."
 msgstr "Ingen begränsning om 0 är angivet."
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "\"Hämta allt\" hämtar post på detta konto"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Brevhuvud"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Lägg till datumfält i brevhuvud"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Skapa Meddelande-ID"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Lägg till användardefinierat brevhuvud"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr "Redigera..."
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-Autentisering (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4128,177 +4128,190 @@ msgstr ""
 "Om du lämnar dessa poster tomma, kommer samma användar-ID och lösenord som "
 "vid hämtning att användas."
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentisera med POP3 innan brev skickas"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 msgid "Command output"
 msgstr "Kommandoutdata"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Sätt automatiskt följande adresser"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Kopia"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Dold kopia"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Svara till"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Signera alla meddelanden"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "Kryptera alla meddelanden"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr "Kryptera vid svar på krypterat meddelande"
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "Använd ASCII-pansar för kryptering"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "Använd klartextsignatur"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Signaturnyckel"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Använd förvald GnuPG-nyckel"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Välj nyckel genom din e-postadress"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Ange nyckel manuellt"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "Användar- eller nyckel-ID:"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "Använd inte SSL"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "Använd SSL för POP3-förbindelse"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Använd STARTTLS-kommando för att starta SSL-session"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "Använd SSL för IMAP4-förbindelse"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "Använd SSL för NNTP-förbindelse"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Skicka (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "Använd SSL för SMTP-förbindelse"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr "Använd icke-blockerande SSL"
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Slå av detta om du har problem med SSL-förbindelsen"
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "Ange SMTP-port"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "Ange POP3-port"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "Ange IMAP4-port"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "Ange NNTP-port"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Ange domännamn"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "IMAP-servermapp"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "Lägg skickade meddelanden i"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "Lägg utkast i"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Lägg borttagna meddelanden i"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "Lägg borttagna meddelanden i"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "Kontonamn har inte angivits."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "E-postadress har inte angivits."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "SMTP-server har inte angivits."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "Användar-ID har inte angivits."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "POP3-server har inte angivits."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4-server har inte angivits."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "NNTP-server har inte angivits."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5280,7 +5293,7 @@ msgstr "Gamla Sylpheed"
 msgid "Custom header setting"
 msgstr "Egendefinierat brevhuvud"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr " Ta bort "
 
@@ -5336,197 +5349,197 @@ msgstr "Skriver konfiguration för visning av brevhuvuden...\n"
 msgid "This header is already in the list."
 msgstr "Detta brevhuvud finns redan i listan."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Filterinställningar"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Vill du verkligen ta bort regeln '%s'?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Ta bort regel"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 msgid "Filter rule"
 msgstr "Filterregel"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr "Om något av följande villkor matchar"
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr "Om alla av följande villkor matchar"
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr "Utför följande åtgärder:"
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr "Till eller Kopia"
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 msgid "Any header"
 msgstr "Något brevhuvud"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 msgid "Edit header..."
 msgstr "Redigera brevhuvud..."
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 msgid "Message body"
 msgstr "Meddelandetext"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr "Resultat av kommando"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr "Ålder"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "innehåller"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 msgid "doesn't contain"
 msgstr "innehåller inte"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr "är"
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr "är inte"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr "matchar regex"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr "matchar inte regex"
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr "är större än"
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr "är mindre än"
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr "är längre än"
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr "är kortare än"
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 msgid "Move to"
 msgstr "Flytta till"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 msgid "Copy to"
 msgstr "Kopiera till"
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Ta inte emot"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 msgid "Delete from server"
 msgstr "Ta bort från server"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 msgid "Set mark"
 msgstr "Markera"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 msgid "Set color"
 msgstr "Färgmarkera"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 msgid "Mark as read"
 msgstr "Markera som läst"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 msgid "Forward as attachment"
 msgstr "Vidarebefordra som bilaga"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 msgid "Redirect"
 msgstr "Omdirigera"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 msgid "Execute command"
 msgstr "Kör kommando"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr "Stoppa regelutvärdering"
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 msgid "folder:"
 msgstr "mapp"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 msgid "day(s)"
 msgstr "dagar"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 msgid "address:"
 msgstr "adress"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 msgid "Edit header list"
 msgstr "Redigera brevhuvudlista"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 msgid "Headers"
 msgstr "Brevhuvuden"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 msgid "Header:"
 msgstr "Brevhuvud:"
 
-#: src/prefs_filter_edit.c:1679
-msgid "Rule name is not specified."
-msgstr "Regelnamn är inte angivet."
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 msgid "Command is not specified."
 msgstr "Kommando är inte angivet."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr "Ogiltigt villkor existerar."
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 msgid "Destination folder is not specified."
 msgstr "Destinationsmapp är inte angiven."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+msgid "Rule name is not specified."
+msgstr "Regelnamn är inte angivet."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr "Ogiltigt villkor existerar."
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr "Ogiltig åtgärd existerar."
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 msgid "Condition not exist."
 msgstr "Villkor saknas."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 msgid "Action not exist."
 msgstr "Åtgärd saknas"
 
@@ -5971,15 +5984,20 @@ msgstr "skrivskyddad"
 msgid "unknown"
 msgstr "okänd"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "Kan inte hämta grupplista."
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan inte hämta grupplista."
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Färdig."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d diskussionsgrupper mottagna (%s lästa)"
diff --git a/po/tr.po b/po/tr.po
index 02e89a2c..1f3a0ec5 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+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,9 +24,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Her hesap için yapılandırma dosyaları okunuyor...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "Yapılandırma dosyasına kayıt yapılamadı\n"
@@ -50,177 +50,177 @@ msgstr "%s:%d adresine IMAP4 bağlantısı yapılıyor ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "TLS oturumuna bağlantı kurulamadı.\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "%d. ileti siliniyor"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "İleti gönderiliyor (%d / %d bayt)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "%s%c%d mesajı %s  içine kopyalanıyor...\n"
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "%s%c%d mesajı %s  içine kopyalanıyor...\n"
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "%s konumundan iletiler alınıyor..."
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "silinen işaretler atanamıyor: %s\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "silinemiyor\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "%s konumundan iletiler alınıyor..."
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 msgid "can't set deleted flags: 1:*\n"
 msgstr "silinen işaretler atanamıyor: 1:*\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 msgid "can't close folder\n"
 msgstr "dizin kapatılamadı\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "%s kök dizini bulunamadı\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 msgid "error occurred while getting LIST.\n"
 msgstr "LIST alınırken hata oluştu.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "%s oluşturulamadı\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "%s Gelen altında oluşturulamadı\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "posta kutusu yaratılamıyor: Liste hatası\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "posta kutusu oluşturulamadı\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, 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:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "posta kutusu silinemedi\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "zarf alınamadı\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "İleti gönderiliyor (%d / %d bayt)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "zarf alınırken bir hata oluştu.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "zarf ayrıştırılamadı: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4 sunucuya bağlantı kurulamadı: %s:%d\n"
 
-#: libsylph/imap.c:2475
+#: libsylph/imap.c:2487
 #, 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:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "alanadına erişilemedi\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "dizin seçilemedi: %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "imap komutu sırasında hata oluştu: CLOSE\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 yetkilendirmesi başarısız.\n"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 girişinde hata.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s, %s üzerine eklenemedi\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(dosya gönderiliyor...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "ileti %s'ye eklenemiyor\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s, %s konumuna kopyalanamadı\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, 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:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "EXPUNGE komutu sırasında hata oluştu\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 msgid "error while imap command: CLOSE\n"
 msgstr "imap komutu sırasında hata oluştu: CLOSE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv, UTF-7 yi %s'e çeviremedi\n"
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv %s yi UTF-7'ye çeviremedi\n"
@@ -308,30 +308,30 @@ msgstr "posta kutusu sıfırlanamıyor.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "%s daki mesajlar %s a aktarılıyor...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "mesaj %s dan %s a kopyalanamadı\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "işaretli dosya açılamadı.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "kaynak dizini hedef dizinle aynı.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "%s%c%d mesajı %s  içine kopyalanıyor...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Dizindeki son numara %s = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -340,7 +340,7 @@ msgstr ""
 "%s dosyası zaten bulunuyor.\n"
 "Dizin oluşturulamadı."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -362,71 +362,71 @@ msgstr "%s:%d adresine NNTP bağlantısı yapılıyor...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "%s:%d konumuna yapılan NNTP bağlantısı koptu.Yeniden bağlanılıyor...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "%d iletisi zaten önbelleklendi.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "%d. makale alınıyor...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "%d. makale okunamadı\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "haber grubu listesi alınamıyor\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "makale postalanamıyor.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "makale alınamıyor : %d\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "grup seçilemiyor: %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "geçersiz makale aralığı: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "yeni makale yok.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "%d - %d haber grubu alınıyor (%s)...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "haber grupları alınamadı\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "haber grupları alınırken hata.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "hatalı haber grubu satırı %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "X başlıkları alınamıyor\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "x başlıkları alınırken hata oluştu.\n"
 
@@ -521,16 +521,16 @@ msgstr "dizin:"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Kod çevriminde hata.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "işaret dosyası açılamadı\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "%d. ileti alınamadı\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Yazdırma komutu geçersiz: `%s'\n"
@@ -717,12 +717,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "İsim"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -730,7 +730,7 @@ msgstr "Protokol"
 msgid "Server"
 msgstr "Sunucu"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Düzenle"
 
@@ -744,7 +744,7 @@ msgstr " Öntanımlı hesap olarak düzenle "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Bu hesabı silmek istiyor musunuz?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Başlıksız"
@@ -996,7 +996,7 @@ msgstr "İleti adresi"
 msgid "Address book"
 msgstr "Adres defteri"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "İsim:"
 
@@ -1011,7 +1011,7 @@ msgstr "Sil"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Ekle"
 
@@ -1183,7 +1183,7 @@ msgid "Group"
 msgstr "Grup"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Dizin"
 
@@ -1728,12 +1728,12 @@ msgid "MIME type"
 msgstr "MIME türü"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Gönder"
@@ -1775,7 +1775,7 @@ msgid "Attach file"
 msgstr "Dosya ekle"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "İmza"
@@ -1988,7 +1988,7 @@ msgid " Check File "
 msgstr " Dosyayı Denetle "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Dosya"
 
@@ -2067,7 +2067,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot Girdisini Düzenle"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2132,7 +2132,7 @@ msgstr "Zaman aşımı (sn) "
 msgid "Maximum Entries"
 msgstr "Azami Girdi Sayısı"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Temel"
 
@@ -2189,7 +2189,7 @@ msgid "Exporting file:"
 msgstr "Dosya aktarılıyor:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr " Seç... "
 
@@ -3653,7 +3653,7 @@ msgstr "Tüm hesaplardaki postaları dağıt"
 msgid "Send queued message(s)"
 msgstr "Kuyruktaki iletileri gönder"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Düzenle"
@@ -3678,7 +3678,7 @@ msgstr "Hepsine ynt."
 msgid "Reply to all"
 msgstr "Herkese yanıtla"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Yönlendir"
 
@@ -3960,218 +3960,218 @@ msgstr ""
 "Hatalı parola! Yeniden deneyin...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Hesap tercihleri penceresi açılıyor...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Hesap%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Yeni hesap için tercihler"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Hesap tercihleri"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Hesap tercihleri penceresi oluşturuluyor...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Al"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Gizlilik"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Bu hesabın adı"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "Öntanımlı kullan"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Kişisel bilgiler"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Tam adı"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "E-Posta adresi"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Kurum"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Sunucu bilgisi"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "Haber grubu (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Hiçbiri (yerel)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Bu sunucu parola istiyor"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "Haber grubu sunucusu"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "İletilerin alınacağı sunucu"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "Gönderme için SMTP sunucu"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "Kullanıcı adı"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Parola"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 msgid "Use secure authentication (APOP)"
 msgstr "Güvenli yetkilendirme kullan (APOP)"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "İleti alındığı zaman sunucudaki kopyasını sil"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "Postayı"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "gün sonra sil"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 gün: hemen sil)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Sunucudaki tüm iletileri indir"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "Alınan ileti boyutu sınırı"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "İletileri alırken filtrele"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Öntanımlı gelen kutusu"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Filtrelenmemiş iletiler bu kutuda bekleyecektir)"
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "Kimlik denetim yöntemi"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "Haberler"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Indirilebilecek azami makale sayısı\n"
 "(0 => limitsiz)"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Alıcı belirtilmedi."
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "'Hepsini Al' seçeneği bu hesaptaki yeni postaları da kontrol etsin"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Başlık"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Tarih başlığını ekle"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "İleti Numarası Oluştur"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Kullanıcı tanımlı başlık ekle"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " Düzenle... "
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Kimlik denetimi"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Kimlik Denetimi (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4180,178 +4180,191 @@ msgstr ""
 "Eğer bu girdileri boş bırakırsanız, aynı\n"
 "kullanıcı adı ve parolası kullanılır."
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Göndermeden önce POP3 ile kimlik denetimi yap"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 msgid "Command output"
 msgstr "Komut çıktısı"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Aşağıdaki adresleri otomatik olarak tanımla"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Yanıtla"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "İletileri öntanımlı olarak imzala"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "İletileri öntanımlı olarak şifrele"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "ASCII formatında şifrele"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "Metin formatlı imza ekle"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "İmza anahtarı"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Öntanımlı GnuPG anahtarını kullan"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Anahtarı e-posta adresine göre seç"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Anahtarı elle seç"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "Kullanıcı ya da anahtar numarası:"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "SSL kullanma"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "POP3 bağlantısı için SSL kullan"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "SSL oturumuna başlamak için STARTSSL komutunu kullan"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "IMAP4 bağlantısı için SSL kullan"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "NNTP bağlantısı için SSL kullan"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Gönder (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "SMTP bağlantısı için SSL kullan"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr "Bloklanmamış SSL Kullan"
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(SSL bağlantısında sorunlar yaşıyorsanız, bu özelliği kapatın)"
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "SMTP portu belirt"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "POP3 portu belirt"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "IMAP4 portu belirt"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "NNTP portu belirt"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Alan adı belirt"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "IMAP sunucu dizini"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "Gönderilen iletileri nerede sakla"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "Taslak mesajlarını buraya koy"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Silinen mesajları buraya koy"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "Silinen mesajları buraya koy"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "Hesap adı girilmemiş."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "İleti adresi girilmemiş."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "SMTP sunucu girilmemiş."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "Kullanıcı numarası girilmemiş."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "POP3 sunucu girilmemiş."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 sunucu girilmemiş."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "NNTP sunucu girilmemiş."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5355,7 +5368,7 @@ msgstr "Eski Sylpheed"
 msgid "Custom header setting"
 msgstr "Özel başlık ayarları"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr " Sil "
 
@@ -5411,198 +5424,198 @@ msgstr "Başlık görüntüleme için yapılandırma dosyasına yazılıyor...\n
 msgid "This header is already in the list."
 msgstr "Bu başlık zaten listede."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Filtre ayarları"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr "Etkin"
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "B kuralı silmek istiyor musunuz?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Kuralı sil"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 msgid "Filter rule"
 msgstr "Filtre kuralı"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr "Aşağıdaki herhangi bir kural eşleşirse"
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr "Aşağıdaki tüm koşullar eşleşirse"
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr "Aşağıdaki eylemleri gerçekleştir:"
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr "Kime veya CC"
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 msgid "Any header"
 msgstr "Herhangi bir başlık"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 msgid "Edit header..."
 msgstr "Başlığı düzenle..."
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 msgid "Message body"
 msgstr "İleti gövdesi"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr "Komut sonucu"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr "Yaş"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "içeriyor"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 msgid "doesn't contain"
 msgstr "içermiyor"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr "ise "
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr "değil ise"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr "regex ile eşleştir"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr "regex ile eşleştirme"
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr "büyükse"
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr "küçükse"
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr "uzunsa"
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr "kısaysa"
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 msgid "Move to"
 msgstr "Taşı"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 msgid "Copy to"
 msgstr "Kopyala"
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Alma"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 msgid "Delete from server"
 msgstr "Sunucudan sil"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 msgid "Set mark"
 msgstr "İşaretle"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 msgid "Set color"
 msgstr "Renk ata"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 msgid "Mark as read"
 msgstr "Okunmuş olarak işaretle"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 msgid "Forward as attachment"
 msgstr "Ek olarak yönlendir"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 msgid "Redirect"
 msgstr "Yeniden yönlendir"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 msgid "Execute command"
 msgstr "Komut çalıştır"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr "Kural dönüşümünü durdur"
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 msgid "folder:"
 msgstr "dizin:"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 #, fuzzy
 msgid "day(s)"
 msgstr "gün sonra sil"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 msgid "address:"
 msgstr "Adres"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 msgid "Edit header list"
 msgstr "Başlık listesini düzenle"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 msgid "Headers"
 msgstr "Başlıklar"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 msgid "Header:"
 msgstr "Başlık:"
 
-#: src/prefs_filter_edit.c:1679
-msgid "Rule name is not specified."
-msgstr "Kural adı belirtilmedi."
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 msgid "Command is not specified."
 msgstr "Komut belirtilmedi."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr "Geçersiz durum bulunuyor."
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 msgid "Destination folder is not specified."
 msgstr "Hedef dizin belirtilmedi."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+msgid "Rule name is not specified."
+msgstr "Kural adı belirtilmedi."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr "Geçersiz durum bulunuyor."
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr "Geçersiz eylem bulunuyor."
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 msgid "Condition not exist."
 msgstr "Durum bulunamadı."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 msgid "Action not exist."
 msgstr "Eylem bulunamadı."
 
@@ -6047,15 +6060,20 @@ msgstr "saltokunur"
 msgid "unknown"
 msgstr "bilinmiyor"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "Haber grubu listesi alınamadı."
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Haber grubu listesi alınamadı."
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Tamamlandı."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d haber grubu alındı (%s okundu)"
diff --git a/po/uk.po b/po/uk.po
index dd8401bf..ddbecf0a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+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,9 +24,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Читаємо конфігурацію для кожного запису...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "не вдалось записати конфігурацію в файл\n"
@@ -49,176 +49,176 @@ msgstr "створення з'єднання INAP4 до %s:%d ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "Не вдалось почати сесію TLS.\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, c-format
 msgid "Getting message %d"
 msgstr "Отримуємо лист %d"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Приєднуємо листи до %s (%d / %d)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Переносимо листи %s в %s ..."
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Копіюємо листи %s в %s ..."
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, c-format
 msgid "Removing messages %s"
 msgstr "Видаляємо листи від %s"
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "не вдалось встановити прапорець видалення: %s\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "не вдалось очистити папку від видалених листів\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Видаляємо всі листи у %s"
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 msgid "can't set deleted flags: 1:*\n"
 msgstr "не вдалось встановити прапорець видалення: 1:*\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 msgid "can't close folder\n"
 msgstr "не вдалось закрити папку\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "коренева папка %s не існує\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 msgid "error occurred while getting LIST.\n"
 msgstr "помилка при отриманні LIST'а.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Не вдалось створити '%s'\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Не вдалось створити '%s' всередині INBOX\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "не вдалось створити скриньку: невдача LIST\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "не вдалось створити скриньку\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "не вдалось перейменувати скриньку: %s на %s\n"
 
-#: libsylph/imap.c:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "не вдалось видалити скриньку\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "не вдалось отримати конверт\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Отримуємо заголовки листів (%d / %d)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "трапилась помилка при отриманні конверта.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "не вдалось розібрати конверт: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не вдалось з'єднатись з сервером IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2475
+#: libsylph/imap.c:2487
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Не вдалось встановити сесію IMAP4 з: %s:%d\n"
 
-#: libsylph/imap.c:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "не вдалось отримати простір імен\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "не вдалось отримати папку: %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 msgid "error on imap command: STATUS\n"
 msgstr "помилка при виконанні команди imap: STATUS\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 msgid "IMAP4 authentication failed.\n"
 msgstr "Невдача авторизації IMAP4.\n"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "Невдача авторизації IMAP4.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не вдалось додати %s до %s\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(посилаємо файл...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "не вдалось приєднати лист до %s\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не вдалось скопіювати %s в %s\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "помилка при виконанні команди imap:  STORE %s %s\n"
 
-#: libsylph/imap.c:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "помилка при виконанні команди imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 msgid "error while imap command: CLOSE\n"
 msgstr "помилка при виконанні команди imap: CLOSE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не може конвертувати UTF-7 в %s\n"
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може конвертувати %s в UTF-7\n"
@@ -305,30 +305,30 @@ msgstr "не вдалось обрізати скриньку до нуля.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Експортуємо листи з %s в %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "не вдалось копіювати %s в %s\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "Не вдалось відкрити файл позначок.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "папка призначення ідентична до вихідної.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Копіюємо лист %s%c%d в %s ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Останній номер в каталозі %s = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -337,7 +337,7 @@ msgstr ""
 "Файл `%s' вже існує.\n"
 "Неможливо створити папку."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -368,71 +368,71 @@ msgstr "створюємо з'єднання NNTP до %s:%d ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "З'єднання NNTP до %s:%d було розірвано. Відновлюємо...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "статтю %d вже кешовано.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "отримуємо статтю %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "не вдалось прочитати статтю %d\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "не вдалось отримати список конференцій\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "не вдалось послати статтю.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "не вдалось отримати статтю %d\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "не вдалось обрати конференцію: %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "невірний діапазон статей: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "нових статтей нема.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "отримуємо xover %d - %d в %s...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "не вдалось отримати xover\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "трапилась помилка при отриманні xover.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "невірний рядок xover: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "не вдалось отримати xhdr\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "трапилась помилка при отриманні xhdr.\n"
 
@@ -526,16 +526,16 @@ msgstr "фільтр мотлоху"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Перетворення кодів не вдалось.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "не вдалось відкрити файл позначок\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "не вдалось стягти лист %d\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Невірна команда друку: `%s'\n"
@@ -724,12 +724,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Ім'я"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Протокол"
 
@@ -737,7 +737,7 @@ msgstr "Протокол"
 msgid "Server"
 msgstr "Сервер"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Редагувати"
 
@@ -750,7 +750,7 @@ msgstr "Встановити як запис за замовчуванням"
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Ви дійсно бажаєте видалити запис '%s'?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 msgid "(Untitled)"
 msgstr "(БезНазви)"
 
@@ -1001,7 +1001,7 @@ msgstr "Адреса e-mail"
 msgid "Address book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Ім'я:"
 
@@ -1016,7 +1016,7 @@ msgstr "Видалити"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Додати"
 
@@ -1181,7 +1181,7 @@ msgid "Group"
 msgstr "Група"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Папка"
 
@@ -1701,12 +1701,12 @@ msgid "MIME type"
 msgstr "тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Послати"
@@ -1748,7 +1748,7 @@ msgid "Attach file"
 msgstr "Приєднати файл"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Підпис"
@@ -1956,7 +1956,7 @@ msgid " Check File "
 msgstr " Перевірити файл "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Файл"
 
@@ -2034,7 +2034,7 @@ msgid "Edit JPilot Entry"
 msgstr "Редагувати запис JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2099,7 +2099,7 @@ msgstr "Таймаут (с)"
 msgid "Maximum Entries"
 msgstr "Максимальний розмір результату"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Основні"
 
@@ -2156,7 +2156,7 @@ msgid "Exporting file:"
 msgstr "Експорт файла:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr " Обрати... "
 
@@ -3613,7 +3613,7 @@ msgstr "Отримати нові листи для всіх записів"
 msgid "Send queued message(s)"
 msgstr "Відіслати лист(и) з черги"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Створення листа"
@@ -3638,7 +3638,7 @@ msgstr "Відповісти всім"
 msgid "Reply to all"
 msgstr "Відповісти всім"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Переслати"
 
@@ -3918,213 +3918,213 @@ msgstr ""
 "Поганий пароль! Пробуємо знову...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Відкриття вікна опцій account'а...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Запис%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Налаштування для нового запису"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Налаштування запису"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Створення вікна опцій запису...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Отримання"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Advanced"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Назва цього запису"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "Встановити як default"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Особиста інформація"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Повне ім'я"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "Поштова адреса"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Організація"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Інформація про сервер"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "Новини (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Нема (локально)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Цей сервер вимагає аутентифікації"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "Сервер новин"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Сервер для отримання"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "Сервер SMTP (відсилання)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "ID користувача"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Пароль"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 msgid "Use secure authentication (APOP)"
 msgstr "Вживати безпечну аутентифікацію (APOP)"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Видаляти листи на сервері після отримання"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "Видалити через"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "днів"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 днів - видаляти негайно)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Завантажити всі листи на сервері"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "Обмеження розміру отриманих листів"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr "Кб"
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Фільтрувати листи при отриманні"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Вхідна папка по замовчуванню"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "У цій папці складаємо невідфільтровані листи."
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "Метод аутентифікації"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "Новини"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 msgid "Maximum number of articles to download"
 msgstr "Максимальна кількість статей для завантаження"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 msgid "No limit if 0 is specified."
 msgstr "Без обмежень, якщо вказано 0."
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "Перевіряти за командою `Отримати всі'"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Заголовок"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Додати поле дати заголовка"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Генерувати Message-ID"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Вживати заголовок, визначений користувачем"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " Редагувати... "
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Аутентифікація"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Аутентифікація SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4132,177 +4132,190 @@ msgstr ""
 "Якщо Ви залишите ці поля порожніми, буде вжито ті ж ID користувача та "
 "пароль, що й для отримання."
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Аутентифікація POP3 перед відсиланням"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 msgid "Command output"
 msgstr "Вивід команди"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Автоматично встановлювати наступні адреси"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Копія"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Приховано"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Зворотня адреса"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Підписувати лист по замовчуванню"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "Шифрувати лист по замовчуванню"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr "Помилка при відповіді на шифрований лист"
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "Вживати \"ASCII-armored\" формат для шифрування"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "Вживати підпис відкритим текстом"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Ключ підпису"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Вживати ключ GnuPG по замовчуванню"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Обрати ключ за Вашою адресою e-mail"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Визначити ключ власноручно"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "Користувач або ідентифікатор ключа:"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "Не вживати SSL"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "Вживати SSL для з'єднання POP3"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Вживати команду STARTTLS для початку сесії SSL"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "Вживати SSL для з'єднання IMAP4"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "Вживати SSL для з'єднання NNTP"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Відсилка (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "Вживати SSL для з'єднання SMTP"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr "Вживати неблокуючий SSL"
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Вимкніть це, якщо стикаєтесь з проблемами при з'єднанні SSL."
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "Вказати порт SMTP"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "Вказати порт POP3"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "Вказати порт IMAP4"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "Вказати порт NNTP"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Вказати ім'я домена"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "Каталог сервера IMAP"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "Зберігати відіслані листи в"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "Зберігати чернетки листів в"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Зберігати видалені листи в"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "Зберігати видалені листи в"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "Назву запису не вказано."
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "Не вказано поштову адресу."
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "Не вказано сервер SMTP."
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "Не вказано ID користувача."
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "Не вказано сервер POP3."
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "Не вказано сервер IMAP4."
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "Не вказано сервер NNTP."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5281,7 +5294,7 @@ msgstr "Старий Sylpheed"
 msgid "Custom header setting"
 msgstr "Власні налаштування заголовка"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr "Видалити"
 
@@ -5337,197 +5350,197 @@ msgstr "Пишемо конфігурацію показу заголовків.
 msgid "This header is already in the list."
 msgstr "Заголовок вже в списку."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Налаштування фільтра"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr "Ввімкнено"
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Справді бажаєте видалити правило '%s'?"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Видалити правило"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 msgid "Filter rule"
 msgstr "Правило фільтрування"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr "Якщо виконано будь-яку з умов"
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr "Якщо виконано всі умови"
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr "Виконати такі дії:"
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr "Кому або Копія"
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 msgid "Any header"
 msgstr "Кожен заголовок"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 msgid "Edit header..."
 msgstr "Редагувати заголовок..."
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 msgid "Message body"
 msgstr "Тіло повідомлення"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr "Результат команди"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr "Давність"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "містить"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 msgid "doesn't contain"
 msgstr "не містить"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr "є"
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr "не є"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr "відповідає регулярному виразу"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr "не відповідає регулярному виразу"
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr "більш ніж"
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr "менш ніж"
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr "довше, ніж"
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr "коротше, ніж"
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 msgid "Move to"
 msgstr "Перенести у"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 msgid "Copy to"
 msgstr "Копіювати в"
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Не отримувати"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 msgid "Delete from server"
 msgstr "Видалити з сервера"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 msgid "Set mark"
 msgstr "Встановити позначку"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 msgid "Set color"
 msgstr "Встановити колір"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 msgid "Mark as read"
 msgstr "Позначити як прочитане"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 msgid "Forward as attachment"
 msgstr "Переслати далі як вкладення"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 msgid "Redirect"
 msgstr "Переспрямувати"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 msgid "Execute command"
 msgstr "Виконати команду"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr "Припинити обчислення правила"
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 msgid "folder:"
 msgstr "папка:"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 msgid "day(s)"
 msgstr "днів"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 msgid "address:"
 msgstr "адреса:"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 msgid "Edit header list"
 msgstr "Редагувати список заголовків"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 msgid "Headers"
 msgstr "Заголовки"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 msgid "Header:"
 msgstr "Заголовок:"
 
-#: src/prefs_filter_edit.c:1679
-msgid "Rule name is not specified."
-msgstr "Не вказано назву правила."
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 msgid "Command is not specified."
 msgstr "Не задано команду."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr "Існує непридатна умова."
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 msgid "Destination folder is not specified."
 msgstr "Папку призначення не вказано."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+msgid "Rule name is not specified."
+msgstr "Не вказано назву правила."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr "Існує непридатна умова."
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr "Існує непридатна дія."
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 msgid "Condition not exist."
 msgstr "Умова не існує."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 msgid "Action not exist."
 msgstr "Дія не існує."
 
@@ -5971,15 +5984,20 @@ msgstr "тільки для читання"
 msgid "unknown"
 msgstr "невідомо"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "Не вдалось отримати список конференцій"
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Не вдалось отримати список конференцій"
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Виконано."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d конференцій отримано (%s прочитано)"
diff --git a/po/vi.po b/po/vi.po
index 58cd7b4f..e24c394d 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+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,9 +19,9 @@ 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/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "lỗi khi lưu cấu hình vào tập tin\n"
@@ -44,177 +44,177 @@ msgstr "đang tạo kết nối IMAP4 tới %s:%d ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "Không thể khởi động phiên TLS.\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, c-format
 msgid "Getting message %d"
 msgstr "Đang lấy thư %d"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Đang ghép thư vào %s (%d / %d)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Đang chuyển thư %s tới %s ..."
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Đang chép thư %s tới %s ..."
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, c-format
 msgid "Removing messages %s"
 msgstr "Đang xoá thư %s"
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "không thể đặt cờ đã xoá: %s\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "không thể xoá\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Xoá mọi thư trong %s"
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 msgid "can't set deleted flags: 1:*\n"
 msgstr "không thể đặt cờ đã xoá: 1:*\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 msgid "can't close folder\n"
 msgstr "không thể đóng thư mục\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, 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:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 msgid "error occurred while getting LIST.\n"
 msgstr "xảy ra lỗi khi lấy LIST.\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Không thể tạo '%s'\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Không thể tạo '%s' ở INBOX\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 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:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "không thể tạo hộp thư\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, 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:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "không thể xoá hộp thư\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "không thể lấy phong bì\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Đang lấy header của thư (%d / %d)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "xảy ra lỗi khi lấy phong bì.\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "không thể phân tích phong bì: %s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, 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:2475
+#: libsylph/imap.c:2487
 #, 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:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "không thể lấy khoảng định danh (namespace)\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "không thể chọn thư mục: %s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "có lỗi khi chạy lệnh imap: CLOSE\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 msgid "IMAP4 authentication failed.\n"
 msgstr "Xác thực IMAP4 thất bại:\n"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "Đăng nhập IMAP4 thất bại.\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "không thể ghep %s vào %s\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(đang gửi tập tin...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "không thể ghép thư vào %s\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "không thể chép %s tới %s\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, 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:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "có lỗi khi chạy lệnh imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 msgid "error while imap command: CLOSE\n"
 msgstr "có lỗi khi chạy lệnh imap: CLOSE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, 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:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv không thể chuyển %s sang UTF-7\n"
@@ -299,30 +299,30 @@ msgstr "không thể giảm số lượng hộp thư xuống 0.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Xuất thư từ %s sang %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "không thể chép thư %s tới %s\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "Không thể mở tập tin đánh đấu.\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "thư mục nguồn cũng chính là thư mục gốc.\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Đang chép thư %s%c%d tới %s ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Số cuối trong thư mục %s = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -331,7 +331,7 @@ msgstr ""
 "Tập tin `%s' đã có trước.\n"
 "Không thể tạo thư mục."
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -360,71 +360,71 @@ msgstr "đang tạo kết nối NNTP tới %s:%d ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "Kết nối NNTP tới %s:%d đã bị ngắt. Đang kết nối lại...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "văn bản %d vừa được đưa vào bộ đệm.\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "đang lấy văn bản %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "không thể đọc văn bản %d\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "không lấy được danh sách nhóm tin\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "không thể gửi bài viết.\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "không thể lấy bài viết %d\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "không chọn được nhóm: %s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "phạm vi bài không hợp lệ: %d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "không có bài mới.\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "đang lấy xover %d - %d trong %s...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "không lấy được vover\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "có lỗi khi lấy xover.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "dòng xover không hợp lệ: %s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "không lấy được xhdr\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "có lỗi khi lấy xhdr.\n"
 
@@ -518,16 +518,16 @@ msgstr "Lọc thư rác"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Chuyển đổi mã thất bại.\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "không thể mở tập tin đánh dấu\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "không thể lấy thư %d\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Lệnh in không hợp lệ: `%s'\n"
@@ -702,12 +702,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Tên"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "Giao thức"
 
@@ -715,7 +715,7 @@ msgstr "Giao thức"
 msgid "Server"
 msgstr "Máy chủ"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Soạn"
 
@@ -728,7 +728,7 @@ msgstr " Đặt là_m tài khoản mặc định "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Bạn có thực sự muốn xoá tài khoản '%s' không?"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 msgid "(Untitled)"
 msgstr "(Chưa đặt tên)"
 
@@ -979,7 +979,7 @@ msgstr "Địa chỉ email"
 msgid "Address book"
 msgstr "Sổ địa chỉ"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Tên:"
 
@@ -994,7 +994,7 @@ msgstr "Xoá"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "Thêm"
 
@@ -1163,7 +1163,7 @@ msgid "Group"
 msgstr "Nhóm"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "Thư mục"
 
@@ -1683,12 +1683,12 @@ msgid "MIME type"
 msgstr "Kiểu MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "Kích thước"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Gửi"
@@ -1730,7 +1730,7 @@ msgid "Attach file"
 msgstr "Đính kèm tập tin"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Chữ kí"
@@ -1938,7 +1938,7 @@ msgid " Check File "
 msgstr " Kiểm tra tập tin "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "Tập tin"
 
@@ -2016,7 +2016,7 @@ msgid "Edit JPilot Entry"
 msgstr "Soạn mục JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2081,7 +2081,7 @@ msgstr "Hết hạn (giây)"
 msgid "Maximum Entries"
 msgstr "Số mục tối đa"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "Cơ bản"
 
@@ -2138,7 +2138,7 @@ msgid "Exporting file:"
 msgstr "Đang xuất tập tin:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr "Chọn... "
 
@@ -3600,7 +3600,7 @@ msgstr "Sáp nhật thư mới của mọi tài khoản"
 msgid "Send queued message(s)"
 msgstr "Gửi thư đang đợi"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Viết thư"
@@ -3625,7 +3625,7 @@ msgstr "Hồi âm tất cả"
 msgid "Reply to all"
 msgstr "Hồi âm cho tất cả"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "Chuyển tiếp"
 
@@ -3903,213 +3903,213 @@ msgstr ""
 "Mật khẩu sai! Thử lại...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "Đang mở cửa sổ cấu hình tài khoản...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "Tài khoản %d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "Cấu hình cho tài khoản mới"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "Cấu hình tài khoản"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "Đang tạo của sổ cấu hình tài khoản...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Nhận"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Riêng tư"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Nâng cao"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "Tên của tài khoản này"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "Đặt là mặc định"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "Thông tin cá nhân"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "Tên đầy đủ"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "Địa chỉ thư"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "Tổ chức"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "Thông tin máy chủ"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "Tin tức (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "Không (nội bộ)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "Máy chủ này yêu cầu xác thực"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "Máy chủ tin tức"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "Máy chủ nhận"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "Máy chủ SMTP (gửi)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "ID người dùng"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 msgid "Use secure authentication (APOP)"
 msgstr "Dùng xác thực bảo mật (APOP)"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "Xoá thư khỏi máy chủ sau khi nhận"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "Xoá sau"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "ngày"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 ngày: xoá ngay lập tức)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "Tải mọi thư trên máy chủ"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "Giới hạn kích thước khi nhận"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "Lọc thư khi nhận"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "Hộp nhận mặc định"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Thư chưa lọc sẽ được lưu vào thư mục này."
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "Phương thức xác thực"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Tự động"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "Tin tức"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 msgid "Maximum number of articles to download"
 msgstr "Số bài tải về tối đa"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 msgid "No limit if 0 is specified."
 msgstr "Không giới hạn nếu ghi là 0"
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Lấy tất' sẽ kiểm tra các thư mới của tài khoản này"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Header"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "Thêm trường Ngày tháng cho header"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "Tạo ID của thư"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "Thêm header theo định nghĩa người dùng"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " Soạn... "
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "Xác thực"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Xác thực SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4117,177 +4117,190 @@ msgstr ""
 "Nếu bạn bỏ trống các mục này, chương trình sẽ dùng ID người dùng và mật khẩu "
 "này khi nhận."
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "Xác thực với POP3 trước khi gửi"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 msgid "Command output"
 msgstr "Đầu ra của lệnh"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "Tự động đặt địa chỉ sau"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "Hồi âm cho"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "Kí tên theo mặc định"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "Mã hoá thư theo mặc định"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr "Mã hoá khi trả lời thư mã hoá"
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "Dùng định dạng ASCII-armored để mã hoá"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "Dùng chữ kí là văn bản thuần tuý"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "Khoá của chữ kí"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "Dùng khoá GnuPG mặc định"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "Chọn khoá theo địa chỉ thư của bạn"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "Chỉ định khoá theo cách thủ công"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "Người dùng hoặc ID của khoá:"
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "Không dùng SSL"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "Dùng SSL cho kết nối POP3"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Dùng lệnh STARTTLS để khởi động phiên SSL"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "Dùng SSL cho kết nối IMAP4"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "Dùng SSL cho kết nối NNTP"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "Gửi (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "Dùng SSL cho kết nối SMTP"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr "Dùng SSL dạng không chặn"
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Tắt nếu bạn có vấn đề với kết nối SSL."
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "Chỉ định cổng STMP"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "Chỉ định cổng POP3"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "Chỉ định cổng IMAP4"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "Chỉ định cổng NNTP"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "Chỉ định tên miền"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "Thư mục máy chủ IMAP"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "Chuyển thư đã gửi vào"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "Chuyển thư nháp vào"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "Chuyển thư đã xoá vào"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "Chuyển thư đã xoá vào"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "Tên tài khoản chưa được nhập"
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "Địa chỉ thư chưa được nhập"
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "Máy chủ SMTP chưa được nhập"
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "ID người dùng chưa được nhập"
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "Máy chủ POP3 chưa được nhập"
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "Máy chủ IMAP4 chưa được nhập"
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "Máy chủ NNTP chưa được nhập"
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5271,7 +5284,7 @@ msgstr "Sylpheed cũ"
 msgid "Custom header setting"
 msgstr "Thiết lập header tuỳ biến"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr " Xoá "
 
@@ -5327,197 +5340,197 @@ msgstr "Đang ghi cấu hình để hiển thị header...\n"
 msgid "This header is already in the list."
 msgstr "Header này đã có trên danh sách."
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "Thiết lập bộ lọc"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr "Cho phép"
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Bạn có thực sự muốn xoá quy tắc '%s' không"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "Xoá quy tắc"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 msgid "Filter rule"
 msgstr "Quy tắc lọc"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr "Nếu phù hợp với bất kì điều kiện nào dưới đây"
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr "Nếu phù hợp với tất cả các điều kiện dưới đây"
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr "Thực hiện các thao tác sau:"
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr "Người nhận hoặc Cc"
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 msgid "Any header"
 msgstr "Bất kì header nào"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 msgid "Edit header..."
 msgstr "Soạn header..."
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 msgid "Message body"
 msgstr "Nội dung thư"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr "Kết quả của lệnh"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr "Tuổi"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "chứa"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 msgid "doesn't contain"
 msgstr "không chứa"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr "là"
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr "không là"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr "khớp với regex"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr "không khớp với regex"
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr "lớn hơn"
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr "nhở hơn"
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr "dài hơn"
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr "ngắn hơn"
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 msgid "Move to"
 msgstr "Chuyển tới"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 msgid "Copy to"
 msgstr "Chép tới"
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "Không nhận"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 msgid "Delete from server"
 msgstr "Xoá khỏi máy chủ"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 msgid "Set mark"
 msgstr "Đánh dấu"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 msgid "Set color"
 msgstr "Đặt màu"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 msgid "Mark as read"
 msgstr "Đánh dấu là đã đọc"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 msgid "Forward as attachment"
 msgstr "Chuyển tiếp ở dạng đính kèm"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 msgid "Redirect"
 msgstr "Chuyển hướng"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 msgid "Execute command"
 msgstr "Chạy lệnh"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 msgid "folder:"
 msgstr "thư mục:"
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 msgid "day(s)"
 msgstr "ngày"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 msgid "address:"
 msgstr "địa chỉ:"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 msgid "Edit header list"
 msgstr "Soạn danh sách header"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 msgid "Headers"
 msgstr "Header"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 msgid "Header:"
 msgstr "Header:"
 
-#: src/prefs_filter_edit.c:1679
-msgid "Rule name is not specified."
-msgstr "Chưa đặt tên quy tắc."
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 msgid "Command is not specified."
 msgstr "Chưa chỉ định lệnh."
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr "Tồn tại điều kiện không hợp lệ."
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 msgid "Destination folder is not specified."
 msgstr "Chưa chỉ định thư mục đích."
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+msgid "Rule name is not specified."
+msgstr "Chưa đặt tên quy tắc."
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr "Tồn tại điều kiện không hợp lệ."
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr "Tồn tại hành động không hợp lệ."
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 msgid "Condition not exist."
 msgstr "Điều kiện không tồn tại."
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 msgid "Action not exist."
 msgstr "Hành động không tồn tại."
 
@@ -5960,15 +5973,20 @@ msgstr "chỉ đọc"
 msgid "unknown"
 msgstr "không xác định"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "Không lấy được danh sách nhóm tin"
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "Không lấy được danh sách nhóm tin"
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "Xong."
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "Nhận được %d nhóm tin (đã đọc %s)"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3028dca9..6e4b75fa 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+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,9 +20,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "正在读取所有帐号的配置...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "无法写入配置文件\n"
@@ -46,177 +46,177 @@ msgstr "正在创建到 %s:%d 的 IMAP4 连接...\n"
 msgid "Can't start TLS session.\n"
 msgstr "无法启动 TLS 会话。\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "正在删除邮件 %d"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "正在发送邮件 (%d / %d 字节)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "正在移动邮件 %s%c%d 到 %s ...\n"
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "正在复制邮件 %s%c%d 到 %s ...\n"
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "正在从 %s 获取邮件..."
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "无法设置删除标志：%s\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "无法清除\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "正在从 %s 获取邮件..."
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 msgid "can't set deleted flags: 1:*\n"
 msgstr "无法设置删除标志：1:*\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 msgid "can't close folder\n"
 msgstr "无法关闭文件夹\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "根文件夹 %s 不存在\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 msgid "error occurred while getting LIST.\n"
 msgstr "获取列表时发生错误。\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "无法创建“%s”\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "无法在收件箱中创建“%s”\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "无法创建邮箱：LIST 失败\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "无法创建邮箱\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "无法将邮箱 %s 重命名为 %s\n"
 
-#: libsylph/imap.c:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "无法删除邮箱\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "无法获取信封\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "正在发送邮件 (%d / %d 字节)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "获取信封时发生错误。\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "无法解析信封：%s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "无法连接到IMAP4服务器：%s:%d\n"
 
-#: libsylph/imap.c:2475
+#: libsylph/imap.c:2487
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "无法连接到IMAP4服务器：%s:%d\n"
 
-#: libsylph/imap.c:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "无法获得名字空间\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "无法选择文件夹：%s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "执行IMAP命令时发生错误：CLOSE\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 验证失败。\n"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 登录失败。\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "无法把 %s 添加到 %s\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "(正在发送文件...)"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "无法追加邮件到 %s\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "无法将 %s 复制到 %s\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "执行IMAP命令时发生错误：STORE %s %s\n"
 
-#: libsylph/imap.c:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "执行IMAP命令时发生错误：EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 msgid "error while imap command: CLOSE\n"
 msgstr "执行IMAP命令时发生错误：CLOSE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv 无法转换 UTF-7 到 %s\n"
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv 无法转换 %s 到 UTF-7\n"
@@ -303,30 +303,30 @@ msgstr "无法将邮箱删除为空。\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "正在从 %s 导出信件到 %s...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "无法复制邮件 %s 到 %s\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "无法打开标记文件。\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "源文件夹与目的文件夹是同一个。\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "正在复制邮件 %s%c%d 到 %s ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "目录 %s 的最后一个序号 = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -335,7 +335,7 @@ msgstr ""
 "文件“%s”已存在。\n"
 "无法创建文件件。"
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -357,71 +357,71 @@ msgstr "正在创建到 %s:%d 的NNTP连接...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "到 %s:%d 的NNTP连接已断开。正在重新连接...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "文章 %d 已被缓存。\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "正在下载文章 %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "无法读取文章 %d\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "无法获取新闻组列表\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "无法发表文章。\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "无法获取文章 %d\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "无法选择组：%s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "无效的文章范围：%d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "没有新文章。\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "正在获取 %3$s 里的 xover %1$d - %2$d...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "无法获取 xover\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "获取 xover 时发生错误。\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "无效的 xover 行：%s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "无法获取 xhdr\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "获取 xhdr 时发生错误。\n"
 
@@ -516,16 +516,16 @@ msgstr "文件夹："
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content()：代码转换失败。\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "无法打开标记文件\n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "无法获取邮件 %d\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "打印命令行无效：“%s”\n"
@@ -711,12 +711,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "名称"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "协议"
 
@@ -724,7 +724,7 @@ msgstr "协议"
 msgid "Server"
 msgstr "服务器"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "编辑"
 
@@ -738,7 +738,7 @@ msgstr " 设为默认帐号 "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "您真的要删除该帐号吗？"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 #, fuzzy
 msgid "(Untitled)"
 msgstr "无标题"
@@ -990,7 +990,7 @@ msgstr "电子邮件地址"
 msgid "Address book"
 msgstr "地址簿"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "姓名："
 
@@ -1005,7 +1005,7 @@ msgstr "删除"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "添加"
 
@@ -1169,7 +1169,7 @@ msgid "Group"
 msgstr "群组"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "文件夹"
 
@@ -1691,12 +1691,12 @@ msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "发送"
@@ -1738,7 +1738,7 @@ msgid "Attach file"
 msgstr "加入附件"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "签名"
@@ -1950,7 +1950,7 @@ msgid " Check File "
 msgstr " 检查文件 "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "文件"
 
@@ -2028,7 +2028,7 @@ msgid "Edit JPilot Entry"
 msgstr "编辑 JPilot 项"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2093,7 +2093,7 @@ msgstr "超时(秒)"
 msgid "Maximum Entries"
 msgstr "最大项数"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "基本"
 
@@ -2150,7 +2150,7 @@ msgid "Exporting file:"
 msgstr "导出文件："
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr " 选择... "
 
@@ -3606,7 +3606,7 @@ msgstr "合并所有帐号的新邮件"
 msgid "Send queued message(s)"
 msgstr "发送队列中的邮件"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "撰写"
@@ -3631,7 +3631,7 @@ msgstr "全部回复"
 msgid "Reply to all"
 msgstr "回复给所有人"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "转发"
 
@@ -3910,395 +3910,408 @@ msgstr ""
 "错误的口令串！重试...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "正在打开帐号首选项窗口...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "帐号%d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "新帐号的首选项"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "帐号首选项"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "正在创建帐号首选项窗口...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "接收"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "隐私"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "高级"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "帐号名称"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "设置为默认帐号"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "个人资料"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "全名"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "邮件地址"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "组织"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "服务器资料"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "新闻组 (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "无(本地)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "该服务器需要验证"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "新闻组服务器"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "接收服务器"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "SMTP服务器(发送)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "用户名"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "密码"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 msgid "Use secure authentication (APOP)"
 msgstr "使用安全验证 (APOP)"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "收到邮件后从服务器上删除"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "以后删除"
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "天"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(0 天：立即删除)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "下载服务器上的所有邮件"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "接收大小限制"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "在接收邮件时进行过滤"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "默认收件箱"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(没有过滤的邮件会保存在该文件夹中)"
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "验证方法"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "自动"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "新闻"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "下载文章的最大数量\n"
 "(指定 0 表示无限制)"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "没有指定收件人。"
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "“全部接收”时检查该帐号的新邮件"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "邮件头"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "添加日期头域"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "生成邮件标识"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "添加用户定义的头域"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " 编辑... "
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "验证"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP验证(SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "如果您不填这些项，将使用和接收邮件相同的用户名和口令。"
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "发送前用POP3验证"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 msgid "Command output"
 msgstr "命令输出"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "自动设置以下地址"
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "抄送"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "密件抄送"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "回复至"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "默认对邮件签名"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "默认对邮件加密"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "使用 ASCII 包裹格式进行加密"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "使用明文签名"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "签名密钥"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "使用默认的GnuPG密钥"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "按照邮件地址选择密钥"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "手工指定密钥"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "用户或者密钥ID："
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "不使用SSL"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "使用SSL连接POP3服务器"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "使用STARTTLS命令开始SSL会话"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "使用SSL连接IMAP4服务器"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "使用SSL连接NNTP服务器"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "发送(SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "使用SSL连接SMTP服务器"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr "使用非阻塞式SSL"
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(如果您遇到SSL连接问题，请关闭该选项)"
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "指定SMTP端口"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "指定POP3端口"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "指定IMAP4端口"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "指定NNTP端口"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "指定域名"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "IMAP4 服务器目录"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "将已发出的邮件保存于"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "将邮件草稿保存于"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "将删除的邮件保存于"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "将删除的邮件保存于"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "没有输入帐号名称。"
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "没有输入邮件地址。"
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "没有输入SMTP服务器。"
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "没有输入用户标识。"
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "没有输入POP3服务器。"
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "没有输入IMAP4服务器。"
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "没有输入NNTP服务器。"
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5288,7 +5301,7 @@ msgstr "旧式的Sylpheed"
 msgid "Custom header setting"
 msgstr "自定义邮件头设置"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr " 删除 "
 
@@ -5344,198 +5357,198 @@ msgstr "正在写邮件头显示配置...\n"
 msgid "This header is already in the list."
 msgstr "该邮件头已经在列表中。"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "过滤设定"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr "已启用"
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "您确实要删除该规则吗？"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "删除规则"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 msgid "Filter rule"
 msgstr "过滤规则"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr "如果以下任何条件满足"
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr "如果以下所有条件满足"
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr "执行下列动作："
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr "收件人或抄送"
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 msgid "Any header"
 msgstr "任何邮件头"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 msgid "Edit header..."
 msgstr "编辑邮件头..."
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 msgid "Message body"
 msgstr "邮件内容"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr "命令结果"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr "邮件时间"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "包含"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 msgid "doesn't contain"
 msgstr "不包含"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr "是"
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr "不是"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr "匹配正则表达式"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr "不匹配正则表达式"
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr "大于"
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr "小于"
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr "长于"
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr "短于"
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 msgid "Move to"
 msgstr "移到"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 msgid "Copy to"
 msgstr "复制到"
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "不接收"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 msgid "Delete from server"
 msgstr "从服务器上删除"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 msgid "Set mark"
 msgstr "设置标记"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 msgid "Set color"
 msgstr "设置颜色"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 msgid "Forward as attachment"
 msgstr "作为附件转发"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 msgid "Redirect"
 msgstr "重定向"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 msgid "Execute command"
 msgstr "执行命令"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr "停止匹配规则"
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 msgid "folder:"
 msgstr "文件夹："
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 #, fuzzy
 msgid "day(s)"
 msgstr "天"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 msgid "address:"
 msgstr "地址："
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 msgid "Edit header list"
 msgstr "编辑邮件头列表"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 msgid "Headers"
 msgstr "邮件头"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 msgid "Header:"
 msgstr "邮件头："
 
-#: src/prefs_filter_edit.c:1679
-msgid "Rule name is not specified."
-msgstr "没有指定规则名称。"
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 msgid "Command is not specified."
 msgstr "没有指定命令行。"
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr "存在无效的条件。"
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 msgid "Destination folder is not specified."
 msgstr "没有指定目标文件夹。"
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+msgid "Rule name is not specified."
+msgstr "没有指定规则名称。"
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr "存在无效的条件。"
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr "存在无效的动作。"
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 msgid "Condition not exist."
 msgstr "不存在的条件。"
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 msgid "Action not exist."
 msgstr "不存在的动作。"
 
@@ -5981,15 +5994,20 @@ msgstr "只读"
 msgid "unknown"
 msgstr "未知"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "无法取回新闻组列表。"
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "无法取回新闻组列表。"
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "完成。"
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "已接收 %d 个新闻组(已读取 %s)"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0ab92198..007c9bb2 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 19:05+0900\n"
+"POT-Creation-Date: 2005-12-13 18:12+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,9 +21,9 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "讀取所有帳號的設定中...\n"
 
-#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
-#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
-#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: libsylph/filter.c:894 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:213
+#: libsylph/prefs_account.c:227 src/prefs_display_header.c:413
 #: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "寫入組態設定時失敗。\n"
@@ -46,176 +46,176 @@ msgstr "正在產生 IMAP4 連線到 %s:%d ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "無法開啟 TLS 連線\n"
 
-#: libsylph/imap.c:1095
+#: libsylph/imap.c:1107
 #, c-format
 msgid "Getting message %d"
 msgstr "擷取第 %d 號郵件"
 
-#: libsylph/imap.c:1212
+#: libsylph/imap.c:1224
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "附加郵件至 %s (%d / %d)"
 
-#: libsylph/imap.c:1304
+#: libsylph/imap.c:1316
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "正在移動郵件 %s 到 %s ..."
 
-#: libsylph/imap.c:1310
+#: libsylph/imap.c:1322
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "正在複製郵件 %s 到 %s ..."
 
-#: libsylph/imap.c:1461
+#: libsylph/imap.c:1473
 #, c-format
 msgid "Removing messages %s"
 msgstr "正在移除郵件 %s"
 
-#: libsylph/imap.c:1467
+#: libsylph/imap.c:1479
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "無法設定刪除的旗標：%s\n"
 
-#: libsylph/imap.c:1475 libsylph/imap.c:1570
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "無法刪除\n"
 
-#: libsylph/imap.c:1558
+#: libsylph/imap.c:1570
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "正在移除 %s 中的所有郵件"
 
-#: libsylph/imap.c:1564
+#: libsylph/imap.c:1576
 msgid "can't set deleted flags: 1:*\n"
 msgstr "無法設定刪除的旗標：1:*\n"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1621
 msgid "can't close folder\n"
 msgstr "無法選擇資料夾\n"
 
-#: libsylph/imap.c:1687
+#: libsylph/imap.c:1699
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "根資料夾 %s 不存在。\n"
 
-#: libsylph/imap.c:1871 libsylph/imap.c:1879
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 msgid "error occurred while getting LIST.\n"
 msgstr "取得 LIST 時發生錯誤。\n"
 
-#: libsylph/imap.c:1993
+#: libsylph/imap.c:2005
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "無法產生 %s\n"
 
-#: libsylph/imap.c:1998
+#: libsylph/imap.c:2010
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "無法在收件夾下產生 %s\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2071
 msgid "can't create mailbox: LIST failed\n"
 msgstr "無法產生信箱：LIST 失敗\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2091
 msgid "can't create mailbox\n"
 msgstr "無法產生信箱\n"
 
-#: libsylph/imap.c:2175
+#: libsylph/imap.c:2187
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "信箱 %s 無法更名為 %s\n"
 
-#: libsylph/imap.c:2255
+#: libsylph/imap.c:2267
 msgid "can't delete mailbox\n"
 msgstr "無法刪除信箱\n"
 
-#: libsylph/imap.c:2299
+#: libsylph/imap.c:2311
 msgid "can't get envelope\n"
 msgstr "無法取得信封。\n"
 
-#: libsylph/imap.c:2312
+#: libsylph/imap.c:2324
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "擷取郵件表頭 (%d / %d)"
 
-#: libsylph/imap.c:2322
+#: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
 msgstr "取得信封時發生錯誤。\n"
 
-#: libsylph/imap.c:2344
+#: libsylph/imap.c:2356
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "無法解析信封：%s\n"
 
-#: libsylph/imap.c:2468
+#: libsylph/imap.c:2480
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "無法連線到 IMAP4 伺服器：%s:%d\n"
 
-#: libsylph/imap.c:2475
+#: libsylph/imap.c:2487
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "無法產生 IMAP4 連線：%s:%d\n"
 
-#: libsylph/imap.c:2550
+#: libsylph/imap.c:2562
 msgid "can't get namespace\n"
 msgstr "無法取得信封。\n"
 
-#: libsylph/imap.c:3078
+#: libsylph/imap.c:3090
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "無法選擇資料夾：%s\n"
 
-#: libsylph/imap.c:3113
+#: libsylph/imap.c:3125
 msgid "error on imap command: STATUS\n"
 msgstr "發生錯誤的 imap 命令： STATUS\n"
 
-#: libsylph/imap.c:3256
+#: libsylph/imap.c:3268
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 認證失敗\n"
 
-#: libsylph/imap.c:3273
+#: libsylph/imap.c:3285
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 登入失敗。\n"
 
-#: libsylph/imap.c:3609
+#: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "無法將郵件從 %s 搬移到 %s。\n"
 
-#: libsylph/imap.c:3616
+#: libsylph/imap.c:3628
 msgid "(sending file...)"
 msgstr "（送出檔案 ...）"
 
-#: libsylph/imap.c:3645
+#: libsylph/imap.c:3657
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "無法附加訊息到 %s\n"
 
-#: libsylph/imap.c:3677
+#: libsylph/imap.c:3689
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "無法將郵件 %s 移到 %s\n"
 
-#: libsylph/imap.c:3701
+#: libsylph/imap.c:3713
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap 發生錯誤，命令為： STORE %s %s\n"
 
-#: libsylph/imap.c:3715
+#: libsylph/imap.c:3727
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap 發生錯誤，命令為： EXPUNGE\n"
 
-#: libsylph/imap.c:3728
+#: libsylph/imap.c:3740
 msgid "error while imap command: CLOSE\n"
 msgstr "imap 發生錯誤，命令為： CLOSE\n"
 
-#: libsylph/imap.c:3995
+#: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "無法將 UTF-7 轉換為 %s\n"
 
-#: libsylph/imap.c:4025
+#: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "無法轉換 %s 為 UTF-7\n"
@@ -302,30 +302,30 @@ msgstr "無法清除信箱。\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "將郵件由 %s 匯出到 %s 中...\n"
 
-#: libsylph/mh.c:412
+#: libsylph/mh.c:421
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "無法將郵件從 %s 搬移到 %s。\n"
 
-#: libsylph/mh.c:487 libsylph/mh.c:610
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "無法開啟標記的檔案。\n"
 
-#: libsylph/mh.c:494 libsylph/mh.c:616
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "來源與目的資料夾相同。\n"
 
-#: libsylph/mh.c:619
+#: libsylph/mh.c:628
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "正在複製訊息 %s%c%d 到 %s ...\n"
 
-#: libsylph/mh.c:790
+#: libsylph/mh.c:799
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "目錄 %s 中最後的編號 = %d\n"
 
-#: libsylph/mh.c:833 libsylph/mh.c:846 src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -334,7 +334,7 @@ msgstr ""
 "檔案「%s」已存在。\n"
 "無法產生資料夾。"
 
-#: libsylph/mh.c:1353
+#: libsylph/mh.c:1362
 #, c-format
 msgid ""
 "Directory name\n"
@@ -362,71 +362,71 @@ msgstr "產生新聞通訊協定連線到 %s:%d , 請稍候...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "到 %s:%d 的新聞通訊協定連線被中斷了。重新連線中...\n"
 
-#: libsylph/news.c:367
+#: libsylph/news.c:377
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "文章 %d 已經被暫存於快取之中。\n"
 
-#: libsylph/news.c:387
+#: libsylph/news.c:397
 #, c-format
 msgid "getting article %d...\n"
 msgstr "正在擷取文章 %d...\n"
 
-#: libsylph/news.c:391
+#: libsylph/news.c:401
 #, c-format
 msgid "can't read article %d\n"
 msgstr "無法讀取文章 %d\n"
 
-#: libsylph/news.c:546
+#: libsylph/news.c:556
 msgid "can't retrieve newsgroup list\n"
 msgstr "無法取得新聞群組列表\n"
 
-#: libsylph/news.c:659
+#: libsylph/news.c:669
 msgid "can't post article.\n"
 msgstr "無法發表文章。\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:695
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "無法取得文章 %d\n"
 
-#: libsylph/news.c:742
+#: libsylph/news.c:752
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "無法選擇新聞群組：%s\n"
 
-#: libsylph/news.c:779
+#: libsylph/news.c:789
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "錯誤的文章範圍：%d - %d\n"
 
-#: libsylph/news.c:792
+#: libsylph/news.c:802
 msgid "no new articles.\n"
 msgstr "沒有新文章。\n"
 
-#: libsylph/news.c:802
+#: libsylph/news.c:812
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "正在擷取 xover %d - %d 於 %s...\n"
 
-#: libsylph/news.c:806
+#: libsylph/news.c:816
 msgid "can't get xover\n"
 msgstr "無法取得 xover\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:826
 msgid "error occurred while getting xover.\n"
 msgstr "取得 xover 時發生錯誤。\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:836
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "xover 內容錯誤：%s\n"
 
-#: libsylph/news.c:845 libsylph/news.c:877
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "無法取得 xhdr\n"
 
-#: libsylph/news.c:857 libsylph/news.c:889
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "取得 xhdr 時發生錯誤。\n"
 
@@ -520,16 +520,16 @@ msgstr "垃圾郵件資料夾"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): 轉碼失敗。\n"
 
-#: libsylph/procmsg.c:535
+#: libsylph/procmsg.c:582
 msgid "can't open mark file\n"
 msgstr "無法開啟標示的檔案 \n"
 
-#: libsylph/procmsg.c:988
+#: libsylph/procmsg.c:1035
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "無法擷取郵件 %d\n"
 
-#: libsylph/procmsg.c:1243
+#: libsylph/procmsg.c:1290
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "列印命令錯誤：「%s」\n"
@@ -716,12 +716,12 @@ msgstr ""
 #: src/compose.c:4220 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:261 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "名稱"
 
-#: src/account_dialog.c:370 src/prefs_account_dialog.c:646
+#: src/account_dialog.c:370 src/prefs_account_dialog.c:652
 msgid "Protocol"
 msgstr "通訊協定"
 
@@ -729,7 +729,7 @@ msgstr "通訊協定"
 msgid "Server"
 msgstr "伺服器"
 
-#: src/account_dialog.c:399 src/prefs_filter.c:326
+#: src/account_dialog.c:399 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "編輯"
 
@@ -742,7 +742,7 @@ msgstr "設為預設帳號(_S)"
 msgid "Do you really want to delete the account '%s'?"
 msgstr "您確定要刪除帳號「%s」嗎？"
 
-#: src/account_dialog.c:488 src/prefs_filter.c:691
+#: src/account_dialog.c:488 src/prefs_filter.c:688
 msgid "(Untitled)"
 msgstr "(無標題)"
 
@@ -993,7 +993,7 @@ msgstr "E-Mail 地址"
 msgid "Address book"
 msgstr "通訊錄"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:362
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "姓名："
 
@@ -1008,7 +1008,7 @@ msgstr "刪除"
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
-#: src/prefs_filter_edit.c:1572
+#: src/prefs_filter_edit.c:1487
 msgid "Add"
 msgstr "新增"
 
@@ -1174,7 +1174,7 @@ msgid "Group"
 msgstr "群組"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1663
+#: src/addressbook.c:3152 src/folderview.c:355 src/prefs_account_dialog.c:1676
 msgid "Folder"
 msgstr "資料夾"
 
@@ -1693,12 +1693,12 @@ msgid "MIME type"
 msgstr "MIME 型態"
 
 #. S_COL_DATE
-#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:585
+#: src/compose.c:4210 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4488
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:516
+#: src/compose.c:4641 src/mainwindow.c:2254 src/prefs_account_dialog.c:522
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "送出"
@@ -1740,7 +1740,7 @@ msgid "Attach file"
 msgstr "附加檔案"
 
 #. signature
-#: src/compose.c:4690 src/prefs_account_dialog.c:1188
+#: src/compose.c:4690 src/prefs_account_dialog.c:1194
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "簽章"
@@ -1948,7 +1948,7 @@ msgid " Check File "
 msgstr " 檢查檔案 "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1199
+#: src/prefs_account_dialog.c:1205
 msgid "File"
 msgstr "檔案"
 
@@ -2026,7 +2026,7 @@ msgid "Edit JPilot Entry"
 msgstr "編輯 JPilot 資料"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1691
+#: src/importldif.c:534 src/prefs_account_dialog.c:1704
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr "..."
@@ -2091,7 +2091,7 @@ msgstr "逾時 (秒)"
 msgid "Maximum Entries"
 msgstr "項目最大值"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:512
+#: src/editldap.c:471 src/prefs_account_dialog.c:518
 msgid "Basic"
 msgstr "基本設定"
 
@@ -2148,7 +2148,7 @@ msgid "Exporting file:"
 msgstr "匯出檔名："
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:909
 msgid " Select... "
 msgstr "選擇..."
 
@@ -3596,7 +3596,7 @@ msgstr "檢查所有帳號的新郵件"
 msgid "Send queued message(s)"
 msgstr "將暫存資料夾中的郵件送出"
 
-#: src/mainwindow.c:2265 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2265 src/prefs_account_dialog.c:524
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "撰寫郵件"
@@ -3621,7 +3621,7 @@ msgstr "全部回覆"
 msgid "Reply to all"
 msgstr "全部回覆"
 
-#: src/mainwindow.c:2301 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2301 src/prefs_filter_edit.c:653
 msgid "Forward"
 msgstr "轉寄"
 
@@ -3900,389 +3900,402 @@ msgstr ""
 "不當的密碼片語! 請再試一次...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:414
+#: src/prefs_account_dialog.c:420
 msgid "Opening account preferences window...\n"
 msgstr "開啟帳號設定的視窗...\n"
 
-#: src/prefs_account_dialog.c:447
+#: src/prefs_account_dialog.c:453
 #, c-format
 msgid "Account%d"
 msgstr "帳號 %d"
 
-#: src/prefs_account_dialog.c:466
+#: src/prefs_account_dialog.c:472
 msgid "Preferences for new account"
 msgstr "新帳號設定"
 
-#: src/prefs_account_dialog.c:471
+#: src/prefs_account_dialog.c:477
 msgid "Account preferences"
 msgstr "帳號設定"
 
-#: src/prefs_account_dialog.c:494
+#: src/prefs_account_dialog.c:500
 msgid "Creating account preferences window...\n"
 msgstr "產生帳號設定的視窗...\n"
 
-#: src/prefs_account_dialog.c:514 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:520 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "接收設定"
 
-#: src/prefs_account_dialog.c:521 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "私人資料"
 
-#: src/prefs_account_dialog.c:525
+#: src/prefs_account_dialog.c:531
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:528 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "進階設定"
 
-#: src/prefs_account_dialog.c:577
+#: src/prefs_account_dialog.c:583
 msgid "Name of this account"
 msgstr "這個帳號的名稱"
 
-#: src/prefs_account_dialog.c:586
+#: src/prefs_account_dialog.c:592
 msgid "Set as default"
 msgstr "設為預設帳號"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:596
 msgid "Personal information"
 msgstr "個人資訊"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:605
 msgid "Full name"
 msgstr "全名"
 
-#: src/prefs_account_dialog.c:605
+#: src/prefs_account_dialog.c:611
 msgid "Mail address"
 msgstr "電子郵件地址"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:617
 msgid "Organization"
 msgstr "服務公司/組織"
 
-#: src/prefs_account_dialog.c:635
+#: src/prefs_account_dialog.c:641
 msgid "Server information"
 msgstr "伺服器資訊"
 
-#: src/prefs_account_dialog.c:656 src/prefs_account_dialog.c:811
-#: src/prefs_account_dialog.c:1447
+#: src/prefs_account_dialog.c:662 src/prefs_account_dialog.c:817
+#: src/prefs_account_dialog.c:1453
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:658 src/prefs_account_dialog.c:916
-#: src/prefs_account_dialog.c:1464 src/prefs_account_dialog.c:1639
+#: src/prefs_account_dialog.c:664 src/prefs_account_dialog.c:922
+#: src/prefs_account_dialog.c:1470 src/prefs_account_dialog.c:1651
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:660
+#: src/prefs_account_dialog.c:666
 msgid "News (NNTP)"
 msgstr "新聞 (NNTP)"
 
-#: src/prefs_account_dialog.c:662
+#: src/prefs_account_dialog.c:668
 msgid "None (local)"
 msgstr "無 (local)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:681
 msgid "This server requires authentication"
 msgstr "這個伺服器需要認證"
 
-#: src/prefs_account_dialog.c:714
+#: src/prefs_account_dialog.c:720
 msgid "News server"
 msgstr "新聞伺服器"
 
-#: src/prefs_account_dialog.c:720
+#: src/prefs_account_dialog.c:726
 msgid "Server for receiving"
 msgstr "接收郵件伺服器"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:732
 msgid "SMTP server (send)"
 msgstr "SMTP 郵件伺服器 (發信)"
 
-#: src/prefs_account_dialog.c:733 src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1114
 msgid "User ID"
 msgstr "帳號"
 
-#: src/prefs_account_dialog.c:739 src/prefs_account_dialog.c:1117
+#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1123
 msgid "Password"
 msgstr "密碼"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:825
 msgid "Use secure authentication (APOP)"
 msgstr "使用安全認證（APOP）"
 
-#: src/prefs_account_dialog.c:822
+#: src/prefs_account_dialog.c:828
 msgid "Remove messages on server when received"
 msgstr "接收郵件時一併從伺服器上移除。"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:839
 msgid "Remove after"
 msgstr "在幾天後移除："
 
-#: src/prefs_account_dialog.c:842
+#: src/prefs_account_dialog.c:848
 msgid "days"
 msgstr "天"
 
-#: src/prefs_account_dialog.c:859
+#: src/prefs_account_dialog.c:865
 msgid "(0 days: remove immediately)"
 msgstr "(設為 0 則為立即移除)"
 
-#: src/prefs_account_dialog.c:866
+#: src/prefs_account_dialog.c:872
 msgid "Download all messages on server"
 msgstr "接收伺服器上所有的郵件。"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:878
 msgid "Receive size limit"
 msgstr "接收郵件大小限制"
 
-#: src/prefs_account_dialog.c:879 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
+#: src/prefs_account_dialog.c:885 src/prefs_filter_edit.c:554
+#: src/prefs_filter_edit.c:956
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:886
+#: src/prefs_account_dialog.c:892
 msgid "Filter messages on receiving"
 msgstr "接收郵件時進行過濾"
 
-#: src/prefs_account_dialog.c:894
+#: src/prefs_account_dialog.c:900
 msgid "Default inbox"
 msgstr "預設的收件夾"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:920
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "未經過濾的郵件將會被存到這個資料夾中。"
 
-#: src/prefs_account_dialog.c:927 src/prefs_account_dialog.c:1078
+#: src/prefs_account_dialog.c:933 src/prefs_account_dialog.c:1084
 msgid "Authentication method"
 msgstr "認證方法"
 
-#: src/prefs_account_dialog.c:937 src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1094
 #: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "自動"
 
-#: src/prefs_account_dialog.c:943
+#: src/prefs_account_dialog.c:949
 msgid "News"
 msgstr "新聞"
 
-#: src/prefs_account_dialog.c:955
+#: src/prefs_account_dialog.c:961
 msgid "Maximum number of articles to download"
 msgstr "一次最多下載文章數量"
 
-#: src/prefs_account_dialog.c:972
+#: src/prefs_account_dialog.c:978
 msgid "No limit if 0 is specified."
 msgstr "設為 0 則不限制數量。"
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:982
 msgid "`Get all' checks for new messages on this account"
 msgstr "「全部檢查」時檢查這個帳號的新郵件"
 
-#: src/prefs_account_dialog.c:1028 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1034 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "郵件標頭設定"
 
-#: src/prefs_account_dialog.c:1035
+#: src/prefs_account_dialog.c:1041
 msgid "Add Date header field"
 msgstr "加入日期"
 
-#: src/prefs_account_dialog.c:1036
+#: src/prefs_account_dialog.c:1042
 msgid "Generate Message-ID"
 msgstr "產生郵件識別碼"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1049
 msgid "Add user-defined header"
 msgstr "加入使用者定義的標頭"
 
-#: src/prefs_account_dialog.c:1045 src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1051 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " 編輯... "
 
-#: src/prefs_account_dialog.c:1055
+#: src/prefs_account_dialog.c:1061
 msgid "Authentication"
 msgstr "認證"
 
-#: src/prefs_account_dialog.c:1063
+#: src/prefs_account_dialog.c:1069
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP 認證 (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:1145
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "若是此欄空白，將使用接收時的帳號與密碼。"
 
-#: src/prefs_account_dialog.c:1151
+#: src/prefs_account_dialog.c:1157
 msgid "Authenticate with POP3 before sending"
 msgstr "送信前先做 POP3 認證"
 
-#: src/prefs_account_dialog.c:1207
+#: src/prefs_account_dialog.c:1213
 msgid "Command output"
 msgstr "命令輸出"
 
-#: src/prefs_account_dialog.c:1218 src/prefs_folder_item.c:330
+#: src/prefs_account_dialog.c:1224 src/prefs_folder_item.c:330
 msgid "Automatically set the following addresses"
 msgstr "在相關欄位上自動加入下列電子郵件信箱："
 
-#: src/prefs_account_dialog.c:1227
+#: src/prefs_account_dialog.c:1233
 msgid "Cc"
 msgstr "複本"
 
-#: src/prefs_account_dialog.c:1240
+#: src/prefs_account_dialog.c:1246
 msgid "Bcc"
 msgstr "密件複本"
 
-#: src/prefs_account_dialog.c:1253
+#: src/prefs_account_dialog.c:1259
 msgid "Reply-To"
 msgstr "回信地址"
 
-#: src/prefs_account_dialog.c:1306
+#: src/prefs_account_dialog.c:1312
 msgid "Sign message by default"
 msgstr "郵件自動做數位簽章"
 
-#: src/prefs_account_dialog.c:1308
+#: src/prefs_account_dialog.c:1314
 msgid "Encrypt message by default"
 msgstr "郵件自動加密"
 
-#: src/prefs_account_dialog.c:1310
+#: src/prefs_account_dialog.c:1316
 msgid "Encrypt when replying to encrypted message"
 msgstr "回覆加密郵件時也進行加密"
 
-#: src/prefs_account_dialog.c:1312
+#: src/prefs_account_dialog.c:1318
 msgid "Use ASCII-armored format for encryption"
 msgstr "使用 ASCII-armored 格式做加密"
 
-#: src/prefs_account_dialog.c:1314
+#: src/prefs_account_dialog.c:1320
 msgid "Use clear text signature"
 msgstr "使用明碼簽章"
 
-#: src/prefs_account_dialog.c:1319
+#: src/prefs_account_dialog.c:1325
 msgid "Sign key"
 msgstr "簽章金鑰"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1333
 msgid "Use default GnuPG key"
 msgstr "使用預設的 GnuPG 金鑰"
 
-#: src/prefs_account_dialog.c:1336
+#: src/prefs_account_dialog.c:1342
 msgid "Select key by your email address"
 msgstr "根據你的電子郵件地址選擇金鑰"
 
-#: src/prefs_account_dialog.c:1345
+#: src/prefs_account_dialog.c:1351
 msgid "Specify key manually"
 msgstr "手動指定金鑰"
 
-#: src/prefs_account_dialog.c:1361
+#: src/prefs_account_dialog.c:1367
 msgid "User or key ID:"
 msgstr "使用者代號或金鑰的識別碼："
 
-#: src/prefs_account_dialog.c:1455 src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1488 src/prefs_account_dialog.c:1506
+#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
+#: src/prefs_account_dialog.c:1494 src/prefs_account_dialog.c:1512
 msgid "Don't use SSL"
 msgstr "不使用 SSL"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1464
 msgid "Use SSL for POP3 connection"
 msgstr "POP3 連線時使用 SSL"
 
-#: src/prefs_account_dialog.c:1461 src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1512
+#: src/prefs_account_dialog.c:1467 src/prefs_account_dialog.c:1484
+#: src/prefs_account_dialog.c:1518
 msgid "Use STARTTLS command to start SSL session"
 msgstr "用 STARTTLS 命令來啟動 SSL"
 
-#: src/prefs_account_dialog.c:1475
+#: src/prefs_account_dialog.c:1481
 msgid "Use SSL for IMAP4 connection"
 msgstr "IMAP4 連線時使用 SSL"
 
-#: src/prefs_account_dialog.c:1481
+#: src/prefs_account_dialog.c:1487
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1502
 msgid "Use SSL for NNTP connection"
 msgstr "NNTP 連線時使用 SSL"
 
-#: src/prefs_account_dialog.c:1498
+#: src/prefs_account_dialog.c:1504
 msgid "Send (SMTP)"
 msgstr "送信設定 (SMTP)"
 
-#: src/prefs_account_dialog.c:1509
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for SMTP connection"
 msgstr "SMTP 連線時使用 SSL"
 
-#: src/prefs_account_dialog.c:1520
+#: src/prefs_account_dialog.c:1526
 msgid "Use non-blocking SSL"
 msgstr "使用 non-blocking SSL"
 
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1529
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "若您使用 SSL 連線時發生問題，請關閉此選項。"
 
-#: src/prefs_account_dialog.c:1609
+#: src/prefs_account_dialog.c:1618
 msgid "Specify SMTP port"
 msgstr "指定 SMTP 連接埠"
 
-#: src/prefs_account_dialog.c:1615
+#: src/prefs_account_dialog.c:1624
 msgid "Specify POP3 port"
 msgstr "指定 POP3 連接埠"
 
-#: src/prefs_account_dialog.c:1621
+#: src/prefs_account_dialog.c:1630
 msgid "Specify IMAP4 port"
 msgstr "指定 IMAP4 連接埠"
 
-#: src/prefs_account_dialog.c:1627
+#: src/prefs_account_dialog.c:1636
 msgid "Specify NNTP port"
 msgstr "指定 NNTP 連接埠"
 
-#: src/prefs_account_dialog.c:1632
+#: src/prefs_account_dialog.c:1641
 msgid "Specify domain name"
 msgstr "指定網域"
 
-#: src/prefs_account_dialog.c:1650
+#: src/prefs_account_dialog.c:1662
 msgid "IMAP server directory"
 msgstr "IMAP 伺服器目錄"
 
-#: src/prefs_account_dialog.c:1704
+#: src/prefs_account_dialog.c:1672
+msgid "Only the subfolders of this directory will be displayed."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1717
 msgid "Put sent messages in"
 msgstr "將已送出之郵件存到"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1719
 msgid "Put draft messages in"
 msgstr "將郵件草稿存到"
 
-#: src/prefs_account_dialog.c:1708
+#: src/prefs_account_dialog.c:1721
+#, fuzzy
+msgid "Put queued messages in"
+msgstr "將刪除郵件存到"
+
+#: src/prefs_account_dialog.c:1723
 msgid "Put deleted messages in"
 msgstr "將刪除郵件存到"
 
-#: src/prefs_account_dialog.c:1769
+#: src/prefs_account_dialog.c:1786
 msgid "Account name is not entered."
 msgstr "未輸入帳號名稱。"
 
-#: src/prefs_account_dialog.c:1773
+#: src/prefs_account_dialog.c:1790
 msgid "Mail address is not entered."
 msgstr "未輸入電子郵件信箱。"
 
-#: src/prefs_account_dialog.c:1778
+#: src/prefs_account_dialog.c:1795
 msgid "SMTP server is not entered."
 msgstr "未輸入發送郵件伺服器。"
 
-#: src/prefs_account_dialog.c:1783
+#: src/prefs_account_dialog.c:1800
 msgid "User ID is not entered."
 msgstr "未輸入使用者帳號。"
 
-#: src/prefs_account_dialog.c:1788
+#: src/prefs_account_dialog.c:1805
 msgid "POP3 server is not entered."
 msgstr "未輸入接收郵件伺服器。"
 
-#: src/prefs_account_dialog.c:1793
+#: src/prefs_account_dialog.c:1810
 msgid "IMAP4 server is not entered."
 msgstr "未輸入接收郵件伺服器。"
 
-#: src/prefs_account_dialog.c:1798
+#: src/prefs_account_dialog.c:1815
 msgid "NNTP server is not entered."
 msgstr "未輸入新聞伺服器。"
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1841
+msgid "Specified folder is not a queue folder."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1915
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5253,7 +5266,7 @@ msgstr "舊設定"
 msgid "Custom header setting"
 msgstr "使用者自定標頭"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1490
 msgid " Delete "
 msgstr "刪除"
 
@@ -5309,197 +5322,197 @@ msgstr "寫入過濾郵件的設定中...\n"
 msgid "This header is already in the list."
 msgstr "這個標頭已存在。"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:210
 msgid "Filter setting"
 msgstr "郵件過濾設定"
 
-#: src/prefs_filter.c:256
+#: src/prefs_filter.c:254
 msgid "Enabled"
 msgstr "已開啟"
 
-#: src/prefs_filter.c:690
+#: src/prefs_filter.c:687
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "您確定要刪除這項規則「%s」嗎？"
 
-#: src/prefs_filter.c:692
+#: src/prefs_filter.c:689
 msgid "Delete rule"
 msgstr "刪除規則"
 
-#: src/prefs_filter_edit.c:347
+#: src/prefs_filter_edit.c:236
 msgid "Filter rule"
 msgstr "郵件過濾規則"
 
-#: src/prefs_filter_edit.c:381
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr "下列任一條件符合"
 
-#: src/prefs_filter_edit.c:383
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr "下列所有條件均符合"
 
-#: src/prefs_filter_edit.c:404
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr "執行下列動作："
 
-#: src/prefs_filter_edit.c:578
+#: src/prefs_filter_edit.c:489
 msgid "To or Cc"
 msgstr "To 或 Cc"
 
-#: src/prefs_filter_edit.c:579
+#: src/prefs_filter_edit.c:490
 msgid "Any header"
 msgstr "任一個標頭"
 
-#: src/prefs_filter_edit.c:580
+#: src/prefs_filter_edit.c:491
 msgid "Edit header..."
 msgstr "編輯郵件標頭..."
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:494
 msgid "Message body"
 msgstr "郵件內容"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:495
 msgid "Result of command"
 msgstr "執行結果"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:497
 msgid "Age"
 msgstr "時效"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:510
 msgid "contains"
 msgstr "包含"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:512
 msgid "doesn't contain"
 msgstr "不包含"
 
-#: src/prefs_filter_edit.c:603
+#: src/prefs_filter_edit.c:514
 msgid "is"
 msgstr "是"
 
-#: src/prefs_filter_edit.c:605
+#: src/prefs_filter_edit.c:516
 msgid "is not"
 msgstr "不是"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:518
 msgid "match to regex"
 msgstr "符合正規表示式"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:520
 msgid "doesn't match to regex"
 msgstr "不符合正規表示式"
 
-#: src/prefs_filter_edit.c:619
+#: src/prefs_filter_edit.c:530
 msgid "is larger than"
 msgstr "大於"
 
-#: src/prefs_filter_edit.c:620
+#: src/prefs_filter_edit.c:531
 msgid "is smaller than"
 msgstr "小於"
 
-#: src/prefs_filter_edit.c:629
+#: src/prefs_filter_edit.c:540
 msgid "is longer than"
 msgstr "長於"
 
-#: src/prefs_filter_edit.c:630
+#: src/prefs_filter_edit.c:541
 msgid "is shorter than"
 msgstr "短於"
 
-#: src/prefs_filter_edit.c:729
+#: src/prefs_filter_edit.c:641
 msgid "Move to"
 msgstr "移動到"
 
-#: src/prefs_filter_edit.c:730
+#: src/prefs_filter_edit.c:642
 msgid "Copy to"
 msgstr "複製到"
 
-#: src/prefs_filter_edit.c:731
+#: src/prefs_filter_edit.c:643
 msgid "Don't receive"
 msgstr "拒絕接收此郵件"
 
-#: src/prefs_filter_edit.c:732
+#: src/prefs_filter_edit.c:644
 msgid "Delete from server"
 msgstr "自伺服器上刪除"
 
-#: src/prefs_filter_edit.c:735
+#: src/prefs_filter_edit.c:647
 msgid "Set mark"
 msgstr "設定標記"
 
-#: src/prefs_filter_edit.c:736
+#: src/prefs_filter_edit.c:648
 msgid "Set color"
 msgstr "設定顏色"
 
-#: src/prefs_filter_edit.c:737
+#: src/prefs_filter_edit.c:649
 msgid "Mark as read"
 msgstr "標記成已讀"
 
-#: src/prefs_filter_edit.c:742
+#: src/prefs_filter_edit.c:654
 msgid "Forward as attachment"
 msgstr "將郵件當成附加檔轉寄"
 
-#: src/prefs_filter_edit.c:743
+#: src/prefs_filter_edit.c:655
 msgid "Redirect"
 msgstr "郵件導向"
 
-#: src/prefs_filter_edit.c:747
+#: src/prefs_filter_edit.c:659
 msgid "Execute command"
 msgstr "執行命令"
 
-#: src/prefs_filter_edit.c:750
+#: src/prefs_filter_edit.c:662
 msgid "Stop rule evaluation"
 msgstr "停止檢查規則"
 
-#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1082
+#: src/prefs_filter_edit.c:668 src/prefs_filter_edit.c:991
 msgid "folder:"
 msgstr "資料夾："
 
-#: src/prefs_filter_edit.c:1056
+#: src/prefs_filter_edit.c:965
 msgid "day(s)"
 msgstr "天"
 
-#: src/prefs_filter_edit.c:1122
+#: src/prefs_filter_edit.c:1031
 msgid "address:"
 msgstr "地址："
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1444
 msgid "Edit header list"
 msgstr "編輯郵件標頭清單"
 
-#: src/prefs_filter_edit.c:1552
+#: src/prefs_filter_edit.c:1467
 msgid "Headers"
 msgstr "郵件標頭"
 
-#: src/prefs_filter_edit.c:1563
+#: src/prefs_filter_edit.c:1478
 msgid "Header:"
 msgstr "郵件標頭："
 
-#: src/prefs_filter_edit.c:1679
-msgid "Rule name is not specified."
-msgstr "沒有指定規則名稱。"
-
-#: src/prefs_filter_edit.c:1767 src/prefs_filter_edit.c:1846
-#: src/prefs_filter_edit.c:1854
+#: src/prefs_filter_edit.c:1663 src/prefs_filter_edit.c:1733
+#: src/prefs_filter_edit.c:1740
 msgid "Command is not specified."
 msgstr "未設定執行指令。"
 
-#: src/prefs_filter_edit.c:1801
-msgid "Invalid condition exists."
-msgstr "有不合法的條件。"
-
-#: src/prefs_filter_edit.c:1823 src/prefs_filter_edit.c:1831
+#: src/prefs_filter_edit.c:1713 src/prefs_filter_edit.c:1720
 msgid "Destination folder is not specified."
 msgstr "目的資料夾未設定。"
 
-#: src/prefs_filter_edit.c:1885
+#: src/prefs_filter_edit.c:1786
+msgid "Rule name is not specified."
+msgstr "沒有指定規則名稱。"
+
+#: src/prefs_filter_edit.c:1807
+msgid "Invalid condition exists."
+msgstr "有不合法的條件。"
+
+#: src/prefs_filter_edit.c:1823
 msgid "Invalid action exists."
 msgstr "有不合法的執行指令。"
 
-#: src/prefs_filter_edit.c:1894
+#: src/prefs_filter_edit.c:1832
 msgid "Condition not exist."
 msgstr "未設定條件。"
 
-#: src/prefs_filter_edit.c:1896
+#: src/prefs_filter_edit.c:1834
 msgid "Action not exist."
 msgstr "指定的指令不存在。"
 
@@ -5943,15 +5956,20 @@ msgstr "唯讀"
 msgid "unknown"
 msgstr "未知的"
 
-#: src/subscribedialog.c:477
+#: src/subscribedialog.c:479
+#, fuzzy
+msgid "Getting newsgroup list..."
+msgstr "無法取得收件人或收件新聞群組名單。"
+
+#: src/subscribedialog.c:487
 msgid "Can't retrieve newsgroup list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/subscribedialog.c:511 src/summaryview.c:766
+#: src/subscribedialog.c:521 src/summaryview.c:766
 msgid "Done."
 msgstr "完成"
 
-#: src/subscribedialog.c:541
+#: src/subscribedialog.c:551
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "已接收 %d 個新聞群組 (%s 已讀)"