made 3.0.0beta1 release.

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

30 files changed, 12657 insertions, 12595 deletions

diff --git a/po/be.po b/po/be.po
index eec7cb15..4a0019a0 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+0900\n"
 "PO-Revision-Date: 2008-05-21 21:16+0300\n"
 "Last-Translator: Mikalai Udodau <crom-a@tut.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -16,226 +16,226 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Чытанне ўсіх канфігурацый для кожнага акаунта...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Злучэнне IMAP4 з %s было разарванае. Перазлучэнне...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Сервер IMAP4 не дазваляе LOGIN.\n"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "стварэнне злучэнне IMAP4 з %s:%d ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "Нельга пачаць сеанс TLS.\n"
 
-#: libsylph/imap.c:1176
-#, c-format
-msgid "Getting message %d"
+#: libsylph/imap.c:1230
+#, fuzzy, c-format
+msgid "Getting message %u"
 msgstr "Атрыманне паведамлення %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Далучэнне паведамлення да %s (%d / %d)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Перанос паведамленняў %s у %s ..."
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Капіраванне паведамленняў %s у %s ..."
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, c-format
 msgid "Removing messages %s"
 msgstr "Выдаленне паведамленняў %s"
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "нельга ўстанавіць флагі выдалення: %s\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "нельга выкрэсліць\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Выдаленне ўсіх паведамленняў з %s..."
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 msgid "can't set deleted flags: 1:*\n"
 msgstr "нельга ўстанавіць флагі выдалення: 1:*\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "нельга закрыць каталог\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "каталог кораню %s не існуе\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "памылка здарылася падчас атрымання LIST.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Нельга стварыць `%s'\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Нельга стварыць '%s' у INBOX\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "нельга стварыць скрыню: LIST схібіў\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "нельга стварыць скрыню\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "нельга перайменаваць скрыню: %s у %s\n"
 
-#: libsylph/imap.c:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "нельга выдаліць скрыню\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "нельга атрымаць агібаючую\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Атрыманне загалоўкаў паведамлення (%d / %d)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "нельга атрымаць агібаючую\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "памылка здарылася падчас атрымання агібаючай.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "немагчыма разабраць агібаючую: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Немагчыма злучыцца з серверам IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2714
+#: libsylph/imap.c:2863
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Немагчыма устанавіць сеанс IMAP4 з: %s:%d\n"
 
-#: libsylph/imap.c:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "нельга атрымаць прастору імён\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "нельга выбраць каталог: %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 msgid "error on imap command: STATUS\n"
 msgstr "памылка пры выкананні загаду imap: STATUS\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "Аўтэнтыфікацыя IMAP4 схібіла.\n"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "Уваход на сервер IMAP4 схібіў.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "нельга далучыць %s да %s\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(адпраўленне файла...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "нельга далучыць паведамленне да %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "нельга скапіраваць %s у %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "памылка пры выкананні загаду imap: STORE %s %s\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "памылка пры выкананні загаду imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "памылка пры выкананні загаду imap: CLOSE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не можа канвертаваць UTF-7 у %s\n"
 
-#: libsylph/imap.c:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не можа канвертаваць %s у UTF-7\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "нельга запісаць у часовы файл\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Атрыманне паведамленняў з %s у %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "нельга прачытаць файл mbox.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "няправільны фармат mbox: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "пашкоджаная скрыня: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "нельга адкрыць часовы файл\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -244,66 +244,62 @@ msgstr ""
 "знойдзены 'unescaped' From:\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "нельга стварыць файл блакіроўкі %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "калі магчыма, ўжывайце 'flock' замест 'file'.\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "нельга стварыць %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "скрыня кантралюецца другім працэсам, чаканне...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "нельга блакіраваць %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "няправільны тып блакіроўкі\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "нельга разблакіраваць %s\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "нельга ўкараціць скрыню да нуля.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Экспартаванне паведамленняў з %s у %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "нельга скапіраваць паведамленне %s у %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "Нельга адкрыць файл пазнак.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "крынічны каталог ідэнтычны з прызначэннем.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Капіраванне паведамленняў %s/%d у %s ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -312,7 +308,7 @@ msgstr ""
 "Файл `%s' ужо існуе.\n"
 "Нельга стварыць каталог."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -331,77 +327,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "стварэнне злучэння NNTP з %s:%d ...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "Злучэнне NNTP з %s:%d было разарванае. Перазлучэнне...\n"
 
-#: libsylph/news.c:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "артыкул %d ужо быў скэшаваны.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "атрыманне артыкула %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "нельга прачытаць артыкул %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "нельга выслаць артыкул.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "нельга атрымаць артыкул %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "нельга выбраць групу: %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "няправільны дыяпазон артыкулаў: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "няма новых артыкулаў.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "атрыманне xover %d - %d у %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "нельга атрымаць xover\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "памылка падчас атрымання xover.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "няправільны радок xover: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "нельга атрымаць xhdr\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "памылка падчас атрымання xhdr.\n"
 
@@ -458,27 +454,27 @@ msgstr "POP3: Выдаленне састарэлага паведамлення
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Пропуск паведамлення %d (%d байт)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "скрыня заблакіраваная\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "час сеансу скончыўся\n"
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "нельга пачаць сеанс TLS\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "памылка здарылася падчас аўтэнтыфікацыі\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "загад не падтрымліваецца\n"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "памылка здарылася падчас сеансу POP3\n"
 
@@ -509,16 +505,16 @@ msgstr "Фільтр непажаданай пошты"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmine_get_text_content(): Канверсія коду схібіла.\n"
 
-#: libsylph/procmsg.c:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "нельга адкрыць файл пазнак\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "нельга атрымаць паведамленне %d\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Радок загаду друку няправільны: `%s'\n"
@@ -673,7 +669,7 @@ msgstr ""
 "Новыя паведамленні будуць правярацца ў гэтым парадку. Пазначце\n"
 "ў слупку `G' акаунты, якія задзейнічаюць атрыманне лістоў праз `Атр. усе'"
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -814,7 +810,7 @@ msgstr "Дадаць Адрас у Кнігу"
 msgid "Address"
 msgstr "Адрас"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Заўвагі"
@@ -823,28 +819,28 @@ msgstr "Заўвагі"
 msgid "Select Address Book Folder"
 msgstr "Выберыце каталог Адраснай кнігі"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Ф_айл"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/Ф_айл/Новая Кн_іга"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/Ф_айл/Новы _vCard"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/Ф_айл/Новы _J-Pilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 msgid "/_File/New _LDAP Server"
 msgstr "/Ф_айл/Новы сервер _LDAP"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -852,100 +848,100 @@ msgstr "/Ф_айл/Новы сервер _LDAP"
 msgid "/_File/---"
 msgstr "/Ф_айл/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/Ф_айл/_Рэдагаваць"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/Ф_айл/_Сцерці"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/Ф_айл/Запісаць"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Ф_айл/Закрыць"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Праца"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Праца/Капіраваць"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Праца/Ўставіць"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/_Адрас"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/_Адрас/Новы Адрас"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/_Адрас/Новая Гру_па"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/_Адрас/Новы К_аталог"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/_Адрас/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/_Адрас/_Рэдагаваць"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/_Адрас/_Выдаліць"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Прылады"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Прылады/Імпартаваць файл _LDIF"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Прылады/Імпартаваць файл _CSV"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Даведка"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Даведка/_Аб праграме"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Новы адрас"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Новая гру_па"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Новы к_аталог"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -958,79 +954,85 @@ msgstr "/Новы к_аталог"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Выдаліць"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 msgid "/_Copy"
 msgstr "/_Капіраваць"
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 msgid "/_Paste"
 msgstr "/_Уставіць"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "Адрас эл.пошты"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адрасная кніга"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Каталог"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "Адрас эл.пошты"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Імя:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Да:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Копія:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Скр.копія:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Выдаліць"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Дадаць"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Пошук"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 msgid "_Close"
 msgstr "За_крыць"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Выдаліць адрас(ы)"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Сапраўды выдаліць гэты адрас(ы)?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1039,36 +1041,36 @@ msgstr ""
 "Ці сапраўды жадаеце выдаліць каталог І ўсе адрасы ў `%s' ?\n"
 "Пры выдаленні толькі каталога, адрасы будуць перанесены ў каталог-продак."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Выдаліць каталог"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "_Folder only"
 msgstr "Толькі К_аталог"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "Folder and _addresses"
 msgstr "Каталог і адрас(ы)"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Сапраўды выдаліць `%s' ?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Новы карыстальнік, немагчыма запісаць індэксны файл."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Новы карыстальнік, немагчыма запісаць файлы адраснай кнігі."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Старая адрасная кніга паспяхова сканвертаваная."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1076,7 +1078,7 @@ msgstr ""
 "Старая адрасная кніга сканвертаваная,\n"
 "немагчыма запісаць новы індэксны файл адрасоў."
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1084,7 +1086,7 @@ msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу,\n"
 "створаны пусты файл новай адраснай кнігі."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1092,7 +1094,7 @@ msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу,\n"
 "немагчыма стварыць файлы новай адраснай кнігі."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1100,90 +1102,84 @@ msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу\n"
 "і нельга стварыць файлы новай адраснай кнігі."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 msgid "Address book conversion error"
 msgstr "Памылка канверсіі адраснай кнігі"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 msgid "Address book conversion"
 msgstr "Канверсія адраснай кнігі"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 msgid "Address Book Error"
 msgstr "Памылка адраснай кнігі"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Немагчыма прачытаць індэкс адрасу"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старая адрасная кніга сканвертаваная, але нельга запісаць новы файл індэксу "
 "адрасоў."
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу, створаны файлы новай адраснай кнігі."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу, немагчыма стварыць файлы новай "
 "адраснай кнігі."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу і стварыць файлы новай адраснай кнігі."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 msgid "Address Book Conversion Error"
 msgstr "Памылка канверсіі Адраснай кнігі"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 msgid "Address Book Conversion"
 msgstr "Канверсія Адраснай кнігі"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Інтэрфейс"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адрасная Кніга"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Асоба"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "Адрас эл.пошты"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Група"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Каталог"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1195,15 +1191,15 @@ msgstr "Супольны адрас"
 msgid "Personal address"
 msgstr "Асабовы адрас"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Заўвага"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Папярэджанне"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Памылка"
 
@@ -1246,7 +1242,7 @@ msgstr "Карычневы"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Няма"
 
@@ -1577,8 +1573,8 @@ msgstr "Паведамленне: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Нельга атрымаць частку састаўнога паведамлення."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Без Тэмы)"
 
@@ -1770,7 +1766,7 @@ msgstr "тып MIME"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Памер"
 
@@ -2010,12 +2006,12 @@ msgstr "Рэдагаваць каталог"
 msgid "Input the new name of folder:"
 msgstr "Ўвядзіце новую назву каталогу:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Новы каталог"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Ўвядзіце назву новага каталогу:"
 
@@ -2161,7 +2157,7 @@ msgstr "Экспарт"
 msgid "Specify source folder and destination file."
 msgstr "Укажыце мэтавы файл mbox і каталог прызначэння."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Фармат даты"
@@ -2176,7 +2172,7 @@ msgstr "Выточны каталог:"
 msgid "Destination:"
 msgstr "Каталог прызначэння:"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2188,7 +2184,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Выбраць... "
@@ -2248,23 +2244,23 @@ msgstr "Смецце"
 msgid "Drafts"
 msgstr "Чарнавікі"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "НовыКаталог"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не можа быць уключана ў назву каталогу."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Каталог `%s' ужо існуе."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Нельга стварыць каталог '%s'."
@@ -2390,31 +2386,31 @@ msgstr "Праверка новых паведамленняў ва ўсіх к�
 msgid "Junk"
 msgstr "Спам"
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Выбраны каталог %s\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Загрузка паведамленняў з %s..."
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Загрузіць усе паведамленні з '%s' ?"
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 msgid "Download all messages"
 msgstr "Загрузіць усе паведамленні"
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Памылка падчас загрузкі паведамлення ў `%s'."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2424,26 +2420,26 @@ msgstr ""
 "(калі жадаеце стварыць каталог з мэтай размяшчэння ў ім\n"
 " падкаталогаў, дадайце `/' на канцы назвы)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Увядзіце новую назву для '%s' :"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Пераіменаваць каталог"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Нельга пераіменаваць каталог '%s'."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Нельга перанесці каталог `%s'."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2452,11 +2448,11 @@ msgstr ""
 "Выдаліць каталог пошуку `%s' ?\n"
 "Самі паведамленні не будуць выдаленыя."
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 msgid "Delete search folder"
 msgstr "Выдаліць каталог пошуку"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2469,20 +2465,20 @@ msgstr ""
 "\n"
 "Сапраўды жадаеце выдаліць?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Нельга выдаліць каталог '%s'."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Ачысціць сметніцу"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 msgid "Delete all messages in the trash folder?"
 msgstr "Выдаліць усе лісты ў каталогу-сметніцы?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2491,34 +2487,34 @@ msgstr ""
 "Сапраўды выдаліць паштовую скрыню `%s' ?\n"
 "(Паведамленні НЕ будуць выдаленыя з дыску)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "Выдаліць скрыню"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Сапраўды выдаліць IMAP4-акаунт `%s'?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "Выдаліць IMAP4-акаунт"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Сапраўды выдаліць групу навін `%s'?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Выдаліць групу навін"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Сапраўды выдаліць акаунт навін `%s'?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Выдаліць акаунт навін"
 
@@ -2530,8 +2526,8 @@ msgstr "Групы навін:"
 msgid "Creating header view...\n"
 msgstr "Стварэнне прагляду загалоўкаў...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Без Адпраўніка)"
 
@@ -2543,71 +2539,71 @@ msgstr "Стварэнне прагляду рысунка...\n"
 msgid "Can't load the image."
 msgstr "Нельга загрузіць рысунак."
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Файл %s не існуе."
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Укажыце мэтавы файл mbox і каталог прызначэння."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Пошук %s ..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Імпарт"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Сканаванне каталога %s ..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Памылка здарылася падчас публікавання\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Імпарт"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Укажыце мэтавы файл mbox і каталог прызначэння."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Выточны каталог:"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Каталог прызначэння:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Новы каталог"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Укажыце мэтавы файл mbox і каталог прызначэння."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Выберыце імпартуемы файл"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Выберыце імпартуемы файл"
 
@@ -2760,142 +2756,142 @@ msgstr "Імпарт файла LDIF у адрасную кнігу"
 msgid "Attributes"
 msgstr "Атрыбуты"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Сілфід: %d новых паведамленняў"
 
-#: src/inc.c:477
+#: src/inc.c:478
 msgid "Authenticating with POP3"
 msgstr "Аўтэнтыфікацыя POP3"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Атрыманне новых паведамленняў"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "Чаканне"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Скасаванае"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Атрыманне"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Зроблена (%d паведамленне(і) (%s) атрымана)"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Няма новых паведамленняў."
 
-#: src/inc.c:708
+#: src/inc.c:715
 #, fuzzy
 msgid "Done"
 msgstr "Зроблена."
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Злучэнне не атрымалася"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Аўтарызацыя схібіла"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Замкнута"
 
-#: src/inc.c:730
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Таймаут"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Завершана (%d новы(х) ліст(оў))"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Завершана (няма новых паведамленняў)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "Здарыліся памылкі падчас атрымання пошты."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "атрыманне новых паведамленняў акаунта %s ...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Аўтэнтыфікацыя POP3"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Атрыманне новых паведамленняў"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Злучэнне з POP3 серверам: %s..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Нельга злучыцца з серверам POP3: %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Аўтэнтыфікацыя..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Атрыманне паведамленняў з %s..."
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Атрыманне колькасці новых паведамленняў (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Атрыманне колькасці новых паведамленняў (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Атрыманне колькасці новых паведамленняў (UIDL)"
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Атрыманне памеру паведамленняў (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "Выдаленне паведамлення %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Адлучэнне"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Атрыманне ліста (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2903,15 +2899,15 @@ msgstr ""
 "Выкананне загаду фільтраванне спаму схібіла.\n"
 "Калі ласка, праверце настаўленні кантролю спаму."
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 msgid "Connection failed."
 msgstr "Злучэнне не атрымалася."
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "Памылка здарылася падчас апрацоўкі пошты."
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2920,29 +2916,29 @@ msgstr ""
 "Здарылася памылка падчас апрацоўкі пошты:\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Не засталося месца на дыску."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "Нельга запісаць файл."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "Памылка сокету."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Злучэнне закрытае аддаленым серверам."
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "Скрыня замкнутая."
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2951,11 +2947,11 @@ msgstr ""
 "Паштовая скрыня замкнутая:\n"
 "%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Аўтэнтыфікацыя схібіла."
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2964,15 +2960,15 @@ msgstr ""
 "Аўтэнтыфікацыя схібіла:\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Таймаут сеансу."
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "Атрыманне скасаванае\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Атрыманне новых паведамленняў з %s у %s...\n"
@@ -2986,24 +2982,20 @@ msgstr "Увядзіце пароль для %s на %s:"
 msgid "Input password"
 msgstr "Увядзіце пароль"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Журнал пратаколу"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread не падтрымліваецца бібліятэкай glib.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Ужыванне: %s [ОПЦЫЯ]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [адрас]      адкрыць вакно напісання паведамлення"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3013,23 +3005,23 @@ msgstr ""
 "                         адкрыць вакно напісання паведамлення з далучаным\n"
 "                         дадаткам з указанага файла (файлаў)"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              атрымаць новыя паведамленні"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          атрымаць новыя лісты з усіх акаунтаў"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 выслаць усе паведамленні з чаргі"
 
-#: src/main.c:542
+#: src/main.c:554
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [каталог]...  паказаць агульную лічбу паведамленняў"
 
-#: src/main.c:543
+#: src/main.c:555
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3037,46 +3029,46 @@ msgstr ""
 "  --status-full [каталог]...\n"
 "                         паказаць статус кожнага каталога"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open id_каталога/нум_ліста адкрыць паведамленне ў новым акне"
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir dirname    задае каталог, які ўтрымлівае файлы канфігурацыі"
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "  --ipcport нум_порта    задае порт для аддаленых загадаў IPC"
 
-#: src/main.c:550
+#: src/main.c:562
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 выйсці з Сілфід"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                рэжым адладкі"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 паказаць даведку і выйсці"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              паказаць інфармацыю аб версіі і выйсці"
 
-#: src/main.c:557
+#: src/main.c:569
 #, c-format
 msgid "Press any key..."
 msgstr "Націсніце любую клавішу..."
 
-#: src/main.c:638
+#: src/main.c:694
 msgid "Filename encoding"
 msgstr "Кадаванне імён файлаў"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3100,19 +3092,19 @@ msgstr ""
 "\n"
 "Працягваць?"
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "Паведамленне ў працэсе напісання. Сапраўды выйсці?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Лісты ў чарзе"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "У чарзе засталіся недасланыя паведамленні. Выйсці зараз?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3120,16 +3112,20 @@ msgstr ""
 "Праграма GnuPG не устаноўлена як след, ці яе версія надта старая.\n"
 "Падтрымка OpenPGP адключаная."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "другі экземпляр Сілфід ужо выконваецца.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 msgid "Migration of configuration"
 msgstr "Міграцыя канфігурацыі"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3775,8 +3771,8 @@ msgstr "Стварэнне галоўнага вакна...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: размяшчэнне колеру %d схібіла\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "зроблена.\n"
 
@@ -4034,7 +4030,7 @@ msgstr "Дадаткі"
 msgid "Message View - Sylpheed"
 msgstr "Прагляд паведамлення - Сілфід"
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Нельга запісаць файл `%s'."
@@ -6090,19 +6086,19 @@ msgstr "Дадатак"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Тэма"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Ад"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Дата"
 
@@ -6112,7 +6108,7 @@ msgid "Number"
 msgstr "Нумар"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 msgid "To"
 msgstr "Да"
 
@@ -6399,29 +6395,29 @@ msgstr "1 паведамленне знойдзена."
 msgid "%d messages found."
 msgstr "%d паведамленняў знойдзена."
 
-#: src/query_search.c:579
-#, c-format
-msgid "Searching %s ..."
-msgstr "Пошук %s ..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Пошук %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, c-format
+msgid "Searching %s ..."
+msgstr "Пошук %s ..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Без Даты)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 msgid "Save as search folder"
 msgstr "Запісаць як каталог пошуку"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr "Месца:"
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 msgid "Folder name:"
 msgstr "Назва каталогу:"
 
@@ -6467,7 +6463,7 @@ msgstr "\t\tака \"%s\"\n"
 msgid "Signature made at %s\n"
 msgstr "Подпіс зроблены %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Памылка праверкі подпісу"
 
@@ -6496,7 +6492,7 @@ msgstr "Аб праграме"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Выдаліць скрыню"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "Не."
 
@@ -6522,58 +6518,58 @@ msgid ""
 "%s"
 msgstr "памылка здарылася падчас сеансу POP3\n"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Атрыманне загалоўкаў паведамлення (%d / %d)"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Атрыманне колькасці новых паведамленняў (STAT)..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 #, fuzzy
 msgid "No message"
 msgstr "Няма новых паведамленняў."
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Выдаліць паведамленне(і)"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Адлучэнне..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Атрыманне новых паведамленняў"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Адправіць паведамленне"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Атрыманне новых паведамленняў"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Атрыманне паведамленняў з %s..."
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 #, fuzzy
 msgid "Delete messages"
 msgstr "Выдаліць паведамленне(і)"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6654,66 +6650,66 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Злучэнне з SMTP серверам: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Памылка здарылася пасля загаду QUIT (ігнараваная)"
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "Адпраўленне HELO..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "Аўтэнтыфікацыя"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 msgid "Sending message..."
 msgstr "Адпраўленне паведамлення..."
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "Адпраўленне EHLO..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Адпраўленне MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Адпраўленне"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Адпраўленне RCPT TO..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Адпраўленне DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Адпраўленне паведамлення (%d / %d байт)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr ""
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Адпраўленне паведамленне"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "Памылка падчас адпраўкі паведамлення."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6722,11 +6718,11 @@ msgstr ""
 "Памылка падчас адпраўкі паведамлення:\n"
 ".%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 msgid "Can't connect to SMTP server."
 msgstr "Нельга злучыцца з серверам SMTP."
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Нельга злучыцца з серверам SMTP: %s:%d"
@@ -6751,70 +6747,70 @@ msgstr "Вынік праверкі подпісу"
 msgid "Checking signature"
 msgstr "Праверка подпісу"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s ад \"%s\""
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Не знойдзены подпіс"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Правільны подпіс ад \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Правільны подпіс"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Подпіс правільны, але ключ для \"%s\" не давераны"
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Правільны подпіс (недавераны ключ)"
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr "Подпіс правільны, але страціў дзейснасць для \"%s\""
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 msgid "Signature valid but expired"
 msgstr "Подпіс правільны, але страціў дзейснасць"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr "Подпіс правільны, але ключ для \"%s\" страціў дзейснасць"
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr "Подпіс правільны, але ключ страціў дзейснасць"
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr "Подпіс правільны, але ключ для \"%s\" быў перагледжаны"
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr "Подпіс правільны, але ключ подпісу быў перагледжаны"
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "НЕСАПРАЎДНЫ подпіс ад \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "ДРЭННЫ подпіс"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "Нестае публічнага ключа, каб праверыць подпіс"
 
@@ -6917,7 +6913,7 @@ msgstr "Атрыманне спісу груп навін..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Немагчыма атрымаць спіс груп навін."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Зроблена."
 
@@ -7044,235 +7040,235 @@ msgstr "Некаторыя маркі засталіся. Апрацаваць?"
 msgid "Scanning folder (%s)..."
 msgstr "Сканіраванне каталогу (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 msgid "_Search again"
 msgstr "Шукаць ізноў"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Нечытаных лістоў болей няма"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr ""
 "Нечытаных паведамленняў не знойдзена.\n"
 "Шукаць ад канца?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Няма нечытаных паведамленняў."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Нечытаных паведамленняў не знойдзена.\n"
 "Перайсці да наступнага каталога?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Новых паведамленняў болей няма"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr ""
 "Новых паведамленняў не знойдзена.\n"
 "Шукаць ад канца?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Няма новых паведамленняў."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr ""
 "Новых паведамленняў не знойдзена.\n"
 "Перайсці ў наступны каталог?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Няма болей маркіраваных паведамленняў"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr ""
 "Не знойдзена маркіраваных паведамленняў.\n"
 "Паўтарыць пошук ад канца?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Няма маркіраваных паведамленняў."
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr ""
 "Не знойдзена маркіраваных паведамленняў.\n"
 "Паўтарыць пошук ад пачатку?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Няма болей памечаных паведамленняў"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr ""
 "Не знойдзена памечаных паведамленняў.\n"
 "Паўтарыць пошук ад канца?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Няма памечаных паведамленняў."
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr ""
 "Не знойдзена памечаных паведамленняў.\n"
 "Паўтарыць пошук ад пачатку?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Сцягванне паведамленняў па тэме..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d выдалены"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d перанесена"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d скапіравана"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " элемент(ы) вылучаны"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d новых, %d нечытаных, агулам %d (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d новых, %d нечытаных, %d агулам"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Упарадкаванне зводкі..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tЗбіранне зводкі з інфармацыі паведамленняў..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Вызначэнне зводкі з дадзеных паведамлення..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Запісанне кэшу зводкі (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Паведамленне %d маркіраванае\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Паведамленне %d маркіраванае як чытанае\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Паведамленне %d маркіраванае як нечытанае\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Паведамленне %s/%d пазначанае да выдалення\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Выдаліць паведамленне(і)"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Сапраўды жадаеце выдаліць паведамленне(і) з сметніцы?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Выдаленне падвоеных паведамленняў..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Паведамленне %s/%d размаркіраванае\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Паведамленне %d пазначанае да пераносу ў %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "Каталог прызначэння супадае з бягучым."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Выберыце каталог"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Паведамленне %d пазначанае да капіравання ў %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 msgid "Destination for copy is same as current folder."
 msgstr "Каталог прызначэння копіі супадае з бягучым."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Выберыце каталог"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 msgid "Error occurred while processing messages."
 msgstr "Памылка падчас апрацоўкі паведамленняў."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Зборка нітак..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Разгрупаванне..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фільтраванне (%d / %d)..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "фільтраванне..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Фільтраванне..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d ліст(ы) прафільтраваны."
@@ -7363,35 +7359,41 @@ msgstr "В_ыслаць паведамленні з чаргі"
 msgid "E_xit"
 msgstr "Вы_йсці"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 msgid "Sylpheed"
 msgstr "Сілфід"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "Не знойдзены подпіс"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "Інфармацыя аб серверы"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "другі экземпляр Сілфід ужо выконваецца.\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "Нельга адкрыць файл пазнак.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "g_thread не падтрымліваецца бібліятэкай glib.\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "Імпарт файла:"
 
diff --git a/po/bg.po b/po/bg.po
index 1a0fd442..c3dd2e4c 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: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+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,294 +20,290 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Четене на конфигурация за всеки акаунт...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 връзката до %s се разпадна. Свързване...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP директория на сървъра"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "създаване на IMAP4 връзка до %s:%d ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "Не може да се стартира TLS сесия.\n"
 
-#: libsylph/imap.c:1176
+#: libsylph/imap.c:1230
 #, fuzzy, c-format
-msgid "Getting message %d"
+msgid "Getting message %u"
 msgstr "Изтриване на съобщение %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Изпращане на съобщение (%d / %d байта)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Копиране на съобщение %s%c%d във %s ...\n"
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Копиране на съобщение %s%c%d във %s ...\n"
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Получаване на съобщения от %s..."
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "не могат да се установят изтрити флагове: %s\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "не може да се заличи\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Получаване на съобщения от %s..."
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 msgid "can't set deleted flags: 1:*\n"
 msgstr "не могат да се установят изтрити флагове: 1:*\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "не може да затвори папка\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "коренната папка %s не съществува\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "грешка при получаване на LIST.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Не може да се създаде '%s'\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Не може да се създаде '%s' под Входящи\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Не може да се създаде пощенска кутия: LIST се провали\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "Не може да се създаде пощенска кутия\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "Не може да се преименува пощенска кутия: %s до %s\n"
 
-#: libsylph/imap.c:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "Не може да се изтрие пощенска кутия\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "не може да се вземе envelope\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Изпращане на съобщение (%d / %d байта)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "не може да се вземе envelope\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "грешка при вземане на envelope.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "не може да се анализира envelope: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не може да се установи връзка с IMAP4 сървър: %s:%d\n"
 
-#: libsylph/imap.c:2714
+#: libsylph/imap.c:2863
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Не може да се установи IMAP4 сесия с:  %s:%d\n"
 
-#: libsylph/imap.c:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "не може да се получи пространството от имена\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "не може да се избере папка: %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "грешка при imap команда: CLOSE\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 удостоверяване провалено.\n"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 влизане провалено.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не може да се прибави %s към %s\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(изпращане на файл...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "съобщението не може да се прибави към %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не може да се копира %s в %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "грешка при imap команда: STORE %s %s\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "грешка при imap команда: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "грешка при imap команда: CLOSE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не може да преобразува UTF-7 до %s\n"
 
-#: libsylph/imap.c:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може да преобразува %s до UTF-7\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "не може да се запише във временен файл\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Получаване на съобщения от %s във %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "не може да се прочете mbox файл.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "невалиден mbox формат: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "деформиран mbox: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "не може да се отвори временен файл\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
 "%s"
 msgstr ""
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "не може да се създаде заключващ файл %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "използвайте 'flock' вместо 'file' ако е възможно.\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "не може да се създаде %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "кутията се притежава от друг процес, изчакване...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "не може да се заключи %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "невалиден тип заключване\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "не може да се отключи %s\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "пощенската кутия не може да се съкрати до нула.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Изнасяне на съобщения от %s във %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "не може да се копира съобщението %s във %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "Не може да се отвори файлът с маркировките.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "изходната папка е еднаква с назначението.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Копиране на съобщение %s%c%d във %s ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -316,7 +312,7 @@ msgstr ""
 "Файлът `%s' вече съществува.\n"
 "Папката не може да се създаде."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -328,77 +324,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "създаване на NNTP връзка до %s:%d ...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP връзката до %s:%d беше прекъсната. Свързване...\n"
 
-#: libsylph/news.c:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "статия %d е вече кеширана.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "взимане на статия %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "не може да се прочете статия %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "не може да се публикува статия.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "не може да се извлече статия %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "не може да се избере група %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, fuzzy, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "Невалиден обхват на статии: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "няма нови статии.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "получаване на xover %d - %d в %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "не може да се получи xover\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "грешка при получаването на xover.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "невалиден xover ред: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "не може да се получи xhdr\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "грешка при получаването на xhdr.\n"
 
@@ -457,27 +453,27 @@ msgstr "POP3: Изтриване на съобщениe с изтекъл сро
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Прескачане на съобщение %d (%d байта)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "пощенската кутия е заключена\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "сесията е просрочена\n"
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "не може да се стартира TLS сесия\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "грешка при удостоверяване\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "командата не се поддържа\n"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "грешка при POP3 сесията\n"
 
@@ -510,16 +506,16 @@ msgstr "Папка"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr ""
 
-#: libsylph/procmsg.c:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "не може да се отвори файлът с маркировките\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "не може да се вземе съобщението %d\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Невалиден команден ред за печат: `%s'\n"
@@ -673,7 +669,7 @@ msgstr ""
 "За нови съобщения ще бъде проверявано в този ред. Отметнете кутийките\n"
 "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -816,7 +812,7 @@ msgstr "Добавяне на Адреса към Книгата"
 msgid "Address"
 msgstr "Адрес"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Забележки"
@@ -825,29 +821,29 @@ msgstr "Забележки"
 msgid "Select Address Book Folder"
 msgstr "Изберете папка от адресната книга"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Файл"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_Файл/Нова _Книга"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_Файл/Нова _vCard"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/_Файл/Нов _JPilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Файл/Нов _Сървър"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -855,101 +851,101 @@ msgstr "/_Файл/Нов _Сървър"
 msgid "/_File/---"
 msgstr "/_Файл/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_Файл/_Редактиране"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_Файл/_Изтриване"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_файл/_Запазване"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Файл/_Затваряне"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Редактиране"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Редактиране/_Вмъкване"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/_Адрес"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/_Адрес/Нов _Адрес"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/_Адрес/Нова _Група"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/_Адрес/Нова _Папка"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/_Адрес/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/_Адрес/_Редактиране"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/_Адрес/_Изтриване"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Инструменти"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Помощ"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Помощ/_Относно"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Нов _Адрес"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Нова _Група"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Нова _Папка"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -962,82 +958,88 @@ msgstr "/Нова _Папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Изтриване"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Копиране..."
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Редактиране/_Вмъкване"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "E-Mail адрес"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Папка"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "E-Mail адрес"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Име:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "До:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Изтриване"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Добавяне"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Справка"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 #, fuzzy
 msgid "_Close"
 msgstr "Затваряне"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Изтриване на адрес(ите)"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Желаете ли изтриване на адрес(ите)?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1047,38 +1049,38 @@ msgstr ""
 "Ако изтривате само папката, адресите ще бъдат преместени в родителската "
 "папка."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Изтриване на папка"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 #, fuzzy
 msgid "_Folder only"
 msgstr "Само папка"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Папка и Адреси"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Желаете ли изтриване на `%s' ?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Нов потребител, не можа да ce запази индексния файл."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Нов потребител, не можа да се запази файла на адресната книга"
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Старата адресна книга конвертирана успешно"
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1086,7 +1088,7 @@ msgstr ""
 "Старата адресна книга конвертирана,\n"
 "не може да се запази новия индексен файл"
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1094,7 +1096,7 @@ msgstr ""
 "Неуспя конвертирането на адресната книга,\n"
 "създадени са нови празни файлове на адресната книга."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1102,7 +1104,7 @@ msgstr ""
 "Неуспя конвертирането на адресната книга\n"
 "и създаване на нови файлове на адресната книга."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1110,96 +1112,90 @@ msgstr ""
 "Неуспя конвертирането на адресната книга\n"
 "и създаване на нови файлове на адресната книга."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Грешка на адресната книга"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Не може да се прочете адресния индекс"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старата адресна книга конвертирана, не може да се запази новия индексен файл"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга, създадени са нови празни файлове "
 "на адресната книга."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга, неуспя създаване на нови файлове "
 "на адресната книга."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга и създаване на нови файлове на "
 "адресната книга."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Лице"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "EMail Адрес"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Група"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Папка"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "LDAP сървър"
 
@@ -1211,15 +1207,15 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Забележка"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Грешка"
 
@@ -1262,7 +1258,7 @@ msgstr "Кафяв"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Никой"
 
@@ -1634,8 +1630,8 @@ msgstr "Съобщение: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Няма Тема)"
 
@@ -1827,7 +1823,7 @@ msgstr "MIME тип"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Размер"
 
@@ -2075,12 +2071,12 @@ msgstr "Редактиране на папка"
 msgid "Input the new name of folder:"
 msgstr "Въведете новото име на папка:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Въведете име на нова папка:"
 
@@ -2226,7 +2222,7 @@ msgstr "Изнасяне"
 msgid "Specify source folder and destination file."
 msgstr "Укажете mbox файл и папка."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Формат на датата"
@@ -2241,7 +2237,7 @@ msgstr "Директрия източник:"
 msgid "Destination:"
 msgstr "Назначение"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2253,7 +2249,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "Избор..."
@@ -2315,23 +2311,23 @@ msgstr "Кошче"
 msgid "Drafts"
 msgstr "Чернови"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "НоваПапка"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може да бъде включено в име на папка"
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папката `%s' вече съществува"
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Папката `%s' не може да бъде създадена."
@@ -2462,32 +2458,32 @@ msgstr "Проверяване за нови съобщения във всич�
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папка %s е избрана\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Изпращане на съобшение..."
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Изпращане на съобшение..."
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 #, fuzzy
 msgid "Download all messages"
 msgstr "Изпращане на съобшение..."
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2497,26 +2493,26 @@ msgstr ""
 "(ако желаете да създадете папка за съхраняване на подпапки,\n"
 " добавете `/' на края на името)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Въведете ново име за `%s'"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Преименуване на папка"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2525,12 +2521,12 @@ msgstr ""
 "Желаете ли премахване на пощенската кутия `%s'?\n"
 "(Съобщенията НЕ се изтриват от диска)"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Изтриване на папка"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2541,21 +2537,21 @@ msgstr ""
 "Всички папки и съобщения под `%s' ше бъдат изтрити.\n"
 "Наистина ли желаете изтриване?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Изчистване на кошчето"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2564,34 +2560,34 @@ msgstr ""
 "Желаете ли премахване на пощенската кутия `%s'?\n"
 "(Съобщенията НЕ се изтриват от диска)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "Премахване на пощенска кутия"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Желаете ли изтриване на IMAP4 акаунт `%s'?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "Изтриване на IMAP4 акаунт"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Желаете ли изтриване на новинарска група `%s'?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Изтриване на новинарска група"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Желаете ли изтриване на новинарски акаунт `%s'?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Изтриване на новинарски акаунт"
 
@@ -2603,8 +2599,8 @@ msgstr "Новинарски групи:"
 msgid "Creating header view...\n"
 msgstr "Създаване изглед на заглавните блокове...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Няма От)"
 
@@ -2616,71 +2612,71 @@ msgstr "Създаване изглед на изображение...\n"
 msgid "Can't load the image."
 msgstr "Не може да се зареди изображението."
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Файлът %s не съществува\n"
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Укажете mbox файл и папка."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Сканиране на папка %s ..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Внасяне"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Сканиране на папка %s ..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Появи се грешка при публикуване\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Внасяне"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Укажете mbox файл и папка."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Директрия източник:"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Папка назначение:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Нова папка"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Укажете mbox файл и папка."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Изберете файл за внасяне"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Изберете файл за внасяне"
 
@@ -2841,158 +2837,158 @@ msgstr "Внасяне на LDIF файл в Адресната книга"
 msgid "Attributes"
 msgstr "Атрибути"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Завършено (%d нови съобщения)"
 
-#: src/inc.c:477
+#: src/inc.c:478
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Удостоверяване"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Получаване на нови съобщения"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "Изчакване"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Отказан"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Получаване"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Завършено (%d съобщения (%s) получени)"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Няма нови съобщения."
 
-#: src/inc.c:708
+#: src/inc.c:715
 #, fuzzy
 msgid "Done"
 msgstr "Изпълнено."
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Връзката се провали"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Удостоверяването се провали"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Заключен"
 
-#: src/inc.c:730
+#: src/inc.c:737
 #, fuzzy
 msgid "Timeout"
 msgstr "Пауза (сек)"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Завършено (%d нови съобщения)"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Завършено (няма нови съобщения)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "Възникнаха грешки при получаване на пощата."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "получаване на нови съобщения от акаунт %s...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Удостоверяване"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Получаване на нови съобщения"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Свързване с POP3 сървър: %s..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не може да се установи връзка с POP3 сървър: %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Удостоверяване..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Получаване на съобщения от %s..."
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Взимане на броят на нови съобщения (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Взимане на броят на нови съобщения (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Взимане на броят на нови съобщения (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Взимане на размерът на съобщенията (LIST)... "
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "Изтриване на съобщение %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Прекъсване"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получаване на съобшение (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 msgid "Connection failed."
 msgstr "Връзката провалена"
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "Възникна грешка при обработка на пощата"
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3001,29 +2997,29 @@ msgstr ""
 "Възникна грешка при обработка на пощата:\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Няма свободно място на диска"
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "Файлът не може да се запише."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "Грешка в сокет."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Връзката е прекратена от отдалечения хост."
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "Пощенската кутия е заключена."
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3032,11 +3028,11 @@ msgstr ""
 "Пощенската кутия е заключена:\n"
 "%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Удостоверяването се провали."
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3045,16 +3041,16 @@ msgstr ""
 "Удостоверяването се провали:\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 #, fuzzy
 msgid "Session timed out."
 msgstr "сесията е просрочена\n"
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "Обединяването е отменено\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Получаване на нови съобшения от %s в %s...\n"
@@ -3068,24 +3064,20 @@ msgstr "Въведете парола за %s на %s:"
 msgid "Input password"
 msgstr "Въведете парола"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Протоколен журнал"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread не се поддържа от glib.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Употреба: %s [ОПЦИЯ]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr " --compose [адрес]    отваряне на прозорец за съставяне"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3095,23 +3087,23 @@ msgstr ""
 "                         отваряне на прозорец за съставяне с прикрепени\n"
 "                         указаните файлове."
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive             получаване на нови съобщения"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all\t     получаване на нови съобщения от всички акаунти"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 изпращане на всички съобщения в опашката"
 
-#: src/main.c:542
+#: src/main.c:554
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [папка]...   показване на пълния брой на съобщения"
 
-#: src/main.c:543
+#: src/main.c:555
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3119,50 +3111,50 @@ msgstr ""
 "  --status-full [папка]...\n"
 "                         показване на състоянието на всяка папка"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:550
+#: src/main.c:562
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                режим на дебъг"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                режим на дебъг"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr ""
 "  --help                 извеждане на тази помощна информация и излизане"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              извеждане на версията и излизане"
 
-#: src/main.c:557
+#: src/main.c:569
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "или натиснете бутона `y'.\n"
 "\n"
 
-#: src/main.c:638
+#: src/main.c:694
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Изходяща кодова таблица"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3176,20 +3168,20 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "Съставя се ново съобщение. Желаете ли изход от програмата?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Съобщения в опашката"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Някои неизпратени съобщения са в опашката. Желаете ли изход от програмата?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3197,17 +3189,21 @@ msgstr ""
 "GnuPG не е инсталиран правилно, или версията му е твърде стара.\n"
 "OpenPGP поддръжката е отменена."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "друг Sylpheed е стартиран вече.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Конфигурация на действия"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3894,8 +3890,8 @@ msgstr "Създаване на главен прозорец...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "готово.\n"
 
@@ -4138,7 +4134,7 @@ msgstr "Притурки"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не може да се запази файлът `%s'."
@@ -6291,19 +6287,19 @@ msgstr "Притурка"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Подател"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Дата"
 
@@ -6313,7 +6309,7 @@ msgid "Number"
 msgstr "Номер"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 #, fuzzy
 msgid "To"
 msgstr "До:"
@@ -6617,30 +6613,30 @@ msgstr "%d намерени съобщения.\n"
 msgid "%d messages found."
 msgstr "%d намерени съобщения.\n"
 
-#: src/query_search.c:579
-#, fuzzy, c-format
-msgid "Searching %s ..."
-msgstr "Сканиране на папка %s ..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Филтриране..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, fuzzy, c-format
+msgid "Searching %s ..."
+msgstr "Сканиране на папка %s ..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Няма Дата)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Запазване в папката с чернови"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 #, fuzzy
 msgid "Folder name:"
 msgstr "Име на файл"
@@ -6691,7 +6687,7 @@ msgstr ""
 msgid "Signature made at %s\n"
 msgstr "Подписът е направен на %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Грешка при проверяване на подписът"
 
@@ -6720,7 +6716,7 @@ msgstr "Относно"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Премахване на пощенска кутия"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "No."
 
@@ -6746,58 +6742,58 @@ msgid ""
 "%s"
 msgstr "грешка при POP3 сесията\n"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Изпращане на съобщение (%d / %d байта)"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Взимане на броят на нови съобщения (STAT)..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 #, fuzzy
 msgid "No message"
 msgstr "Няма нови съобщения."
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Изтриване на съобщение(я)"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Прекъсване..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Получаване на нови съобщения"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Изпращане на съобщение"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Получаване на нови съобщения"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Получаване на съобщения от %s..."
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 #, fuzzy
 msgid "Delete messages"
 msgstr "Изтриване на съобщение(я)"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6874,67 +6870,67 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Свързване с SMTP сървър: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 #, fuzzy
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Появи се грешка изпращане на съобщението."
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "Изпращане на HELO..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "Удостоверяване"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 msgid "Sending message..."
 msgstr "Изпращане на съобшение..."
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "Изпращане на EHLO..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Изпращане на MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Изпращане"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Изпращане на RCPT ДО..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Изпращане на DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Изпращане на съобщение (%d / %d байта)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr ""
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Изпращане на съобшение"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "Появи се грешка изпращане на съобщението."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6943,12 +6939,12 @@ msgstr ""
 "Появи се грешка при изпращане на съобщението:\n"
 "%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 #, fuzzy
 msgid "Can't connect to SMTP server."
 msgstr "Не може да се установи връзка с NNTP сървър: %s:%d\n"
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, fuzzy, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Не може да се установи връзка с NNTP сървър: %s:%d\n"
@@ -6976,71 +6972,71 @@ msgstr "Показване в отделен прозорец на резулт�
 msgid "Checking signature"
 msgstr "Проверяване на подписа"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s от \"%s\""
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Не е намерен подпис"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Валиден подпис от \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Валиден подпис"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr ""
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 #, fuzzy
 msgid "Signature valid but expired"
 msgstr "Подписът е направен на %s\n"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr ""
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr ""
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr ""
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr ""
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "НЕВАЛИДЕН подпис от \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "НЕВАЛИДЕН подпис"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "Няма публичен ключ за проверка на подписът"
 
@@ -7138,7 +7134,7 @@ msgstr "Не може да се получи списък на новинарс�
 msgid "Can't retrieve newsgroup list."
 msgstr "Не може да се получи списък на новинарската група"
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Изпълнено."
 
@@ -7269,221 +7265,221 @@ msgstr "Има останали маркери. Желаете ли да се о
 msgid "Scanning folder (%s)..."
 msgstr "Сканиране на папка (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 #, fuzzy
 msgid "_Search again"
 msgstr "Търсене отново"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Няма повече непрочетени съобщения"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "Не е намерено непрочетено съобщение. Търсене от края?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Няма непрочетени съобщения."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "Не е намерено непрочетено съобщение. Търсене в следващата папка?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Няма повече нови съобщения"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "Не е намерено ново съобщение. Търсене от края?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Няма нови съобщения."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "Не е намерено ново съобщение. Търсене в следващата папка?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Няма повече маркирани съобщения"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "Не е намерено маркирано съобщение. Търсене от края?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Няма маркирани съобщения."
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "Не е намерено маркирано съобщение. Търсене от началото?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Няма повече съобщения с етикет"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "Не е намерено съобщение с етикет. Търсене от края?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Няма съобщения с етикет"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Не е намерено съобщение с етикет. Търсене от началото?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Събиране на съобщения по тема..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d изтрити"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d преместени"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d копирани"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr "избран(и)"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d нови, %d непрочетени, %d общо (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d нови, %d непрочетени, %d общо"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Сортиране на извадката..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tСъставяне на извадката от данните на съобщенията..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Съставяне на извадката от данните на съобщенията..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Записване на кеша на извадката (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Съобщение %d е маркирано\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Съобщение %d е маркирано като прочетено\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Съобщение %d е маркирано като непрочетено\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Съобщение %s/%d е определено за изтриване\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Изтриване на съобщение(я)"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Наистина ли желаете да изтриете съобщенията от кошчето?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Изтриване на повтарящи се съобщения..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Съобщение %s/%d е размаркирано\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Съобщение %d е определено за местене в %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "Назначението е същото като текущата папка."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Избор на папка"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Съобщение %d е определено за копиране в %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Назначението за копиране е същото като текущата папка."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Избор на папка"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 msgid "Error occurred while processing messages."
 msgstr "Възникна грешка при обработка на съобщенията."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Изграждане на нишките..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Махане на нишките..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "филтриране..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
@@ -7578,36 +7574,42 @@ msgstr "Изпращане на съобщенията в опашката"
 msgid "E_xit"
 msgstr "Изход"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Стар Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "Не е намерен подпис"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "Информация за сървъра"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "друг Sylpheed е стартиран вече.\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "Не може да се отвори файлът с маркировките.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "g_thread не се поддържа от glib.\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "Внасяне на файл:"
 
diff --git a/po/cs.po b/po/cs.po
index f878f0d6..3f7a842d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+0900\n"
 "PO-Revision-Date: 2009-08-29 02:23+0200\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Petr Kovar <pknbe@volny.cz>\n"
@@ -24,226 +24,226 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Načítá se nastavení všech účtů...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Spojení přes IMAP4 s %s bylo přerušeno. Obnovuje se spojení...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Server IMAP4 vypnul LOGIN.\n"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "vytváří se spojení přes IMAP4 s %s:%d...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "Nelze spustit relaci TLS.\n"
 
-#: libsylph/imap.c:1176
-#, c-format
-msgid "Getting message %d"
+#: libsylph/imap.c:1230
+#, fuzzy, c-format
+msgid "Getting message %u"
 msgstr "Přijímá se zpráva %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Připojování zprávy k %s (%d / %d)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Přesouvají se zprávy %s do %s..."
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopírují se zprávy %s do %s..."
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, c-format
 msgid "Removing messages %s"
 msgstr "Odstraňují se zprávy %s"
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nelze opatřit příznakem smazané: %s\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "nelze odstranit\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Odstraňují se všechny zprávy v %s"
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nelze opatřit příznakem smazané: 1:*\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "nelze zavřít složku\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "kořenová složka %s neexistuje\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "Během příkazu LIST se vyskytla chyba.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Nelze vytvořit \"%s\"\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Nelze vytvořit \"%s\" v doručené poště\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nelze vytvořit poštovní schránku: selhal příkaz LIST\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "nelze vytvořit poštovní schránku\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, 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:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "nelze smazat poštovní schránku\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "nelze načíst obálku\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Přijímá se záhlaví zprávy (%d / %d)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "nelze načíst obálku\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "během načítání obálky se vyskytla chyba.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "nelze analyzovat obálku: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nelze se spojit se serverem IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2714
+#: libsylph/imap.c:2863
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nelze navázat relaci IMAP4 s: %s:%d\n"
 
-#: libsylph/imap.c:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "nelze vyhledat obálku\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nelze vybrat složku: %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 msgid "error on imap command: STATUS\n"
 msgstr "chyba příkazu služby IMAP: STATUS\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autentizace IMAP4 selhala.\n"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "Neúspěšné přihlášení k IMAP4.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nelze připojit %s k %s\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(posílání souboru...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nelze připojit zprávu k %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nelze kopírovat %s do %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "chyba příkazu služby IMAP: STORE %s %s\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "chyba příkazu služby IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "chyba příkazu služby IMAP: CLOSE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nemůže provést konverzi z UTF-7 na %s\n"
 
-#: libsylph/imap.c:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nemůže provést konverzi z %s na UTF-7\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "nelze zapisovat do dočasného souboru\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Získávají se zprávy z %s do %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "nelze přečíst soubor s poštovní schránkou.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "neplatný formát poštovní schránky: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "selhání poštovní schránky: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "nelze otevřít dočasný soubor\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -252,66 +252,62 @@ msgstr ""
 "nalezeno nezměněné záhlaví From:\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "nelze vytvořit uzamčený soubor %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "pokud to jde, použijte \"flock\" namísto \"file\".\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "nelze vytvořit %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "poštovní schránka je vlastněna jiným procesem, čekejte...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "nelze uzamknout %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "neplatný typ zámku\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "nelze odemknout %s\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "nelze smazat poštovní schránku.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportování zprávy z %s do %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "nelze zkopírovat zprávu %s do %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "Nelze otevřít označený soubor.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "zdrojová složka je stejná jako cílová.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopírování zprávy %s/%d do %s...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -320,7 +316,7 @@ msgstr ""
 "Soubor \"%s\" již existuje.\n"
 "Složku nelze vytvořit."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -339,77 +335,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "vytváří se spojení přes NNTP s %s:%d...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "Spojení přes NNTP s %s:%d bylo přerušeno. Obnovuje se spojení...\n"
 
-#: libsylph/news.c:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "příspěvek %d již ve vyrovnávací paměti je.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "získává se příspěvek %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "nelze přečíst příspěvek %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "nelze odeslat příspěvek.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "nelze přijmout příspěvek %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "nelze vybrat skupinu: %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neplatný rozsah příspěvků: %d až %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "žádné nové příspěvky.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "získává se xover %d - %d v %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "nelze získat xover\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "během získávání xover se vyskytla chyba.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "neplatná řádka xover: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "nelze získat xhdr\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "během získávání xhdr se vyskytla chyba.\n"
 
@@ -466,27 +462,27 @@ msgstr "POP3: Vymazávání staré zprávy %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Přeskakuje se zpráva %d (bajtů %d)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "poštovní schránka je zamčena\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "vypršel čas relace\n"
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "nelze spustit relaci TLS\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "v autentizaci se vyskytla chyba\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "příkaz není podporován\n"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "v relaci POP3 se vyskytla chyba\n"
 
@@ -517,16 +513,16 @@ msgstr "Filtr nevyžádané pošty"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Neúspěšná konverze kódu.\n"
 
-#: libsylph/procmsg.c:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "nelze otevřít označený soubor\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nelze načíst zprávu %d\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Neplatný příkaz při tisku: \"%s\"\n"
@@ -681,7 +677,7 @@ msgstr ""
 "Nové zprávy budou kontrolovány v uvedeném pořadí. Pokud má být účet\n"
 "kontrolován při volbě \"Přijmout vše\", zaškrtněte políčko ve sloupci \"G\"."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -822,7 +818,7 @@ msgstr "Přidat adresu do adresáře"
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Poznámky"
@@ -831,28 +827,28 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vybrat složku adresáře"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Soubor"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_Soubor/Nový _adresář"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_Soubor/Nová _vCard"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/_Soubor/Nový _JPilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 msgid "/_File/New _LDAP Server"
 msgstr "/_Soubor/Nový server _LDAP"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -860,100 +856,100 @@ msgstr "/_Soubor/Nový server _LDAP"
 msgid "/_File/---"
 msgstr "/_Soubor/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_Soubor/Up_ravit"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_Soubor/_Smazat"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_Soubor/_Uložit"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Soubor/_Zavřít"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Úp_ravy"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovat"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/V_ložit"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nová _adresa"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nová _skupina"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Nová s_ložka"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/_Adresa/--"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/U_pravit"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/S_mazat"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovat soubor _LDIF"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Nástroje/Importovat soubor _CSV"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Nápo_věda/_O aplikaci"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Nová _adresa"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Nová skup_ina"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Nová s_ložka"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -966,79 +962,85 @@ msgstr "/Nová s_ložka"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Smazat"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 msgid "/_Copy"
 msgstr "/_Kopírovat"
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 msgid "/_Paste"
 msgstr "/_Vložit"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "E-mailová adresa"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresář"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Složka"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "E-mailová adresa"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Jméno:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Příjemce:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Skrytá kopie:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Přidat"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Vyhledat"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 msgid "_Close"
 msgstr "_Zavřít"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Smazat adresy"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Opravdu chcete smazat tyto adresy?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1047,36 +1049,36 @@ msgstr ""
 "Chcete smazat složku A všechny adresy v \"%s\"?\n"
 "Pokud smažete pouze složku, adresy budou přesunuty do nadřazené složky."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Smazat složku"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "_Folder only"
 msgstr "Pouz_e složku"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "Folder and _addresses"
 msgstr "Složk_u a adresy"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Opravdu smazat \"%s\"?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Nový uživatel, nelze uložit soubor index."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Nový uživatel, nelze uložit soubory s adresářem."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Konverze starého adresáře proběhla úspěšně."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1084,7 +1086,7 @@ msgstr ""
 "Starý adresář převeden,\n"
 "ale nelze uložit nový soubor s indexem."
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1092,7 +1094,7 @@ msgstr ""
 "Konverze adresáře nemohla být provedena,\n"
 "ale byly vytvořeny nové prázdné soubory adresáře."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1100,7 +1102,7 @@ msgstr ""
 "Nelze provést konverzi adresáře,\n"
 "nelze vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1108,86 +1110,80 @@ msgstr ""
 "Nelze provést konverzi adresáře\n"
 "a vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 msgid "Address book conversion error"
 msgstr "Chyba při konverzi adresáře"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 msgid "Address book conversion"
 msgstr "Konverze adresáře"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 msgid "Address Book Error"
 msgstr "Chyba v adresáři"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Nelze načíst index adres"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr "Starý adresář převeden, ale nelze uložit nový soubor index s adresářem"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Konverze adresáře nemohla být provedena, ale byly vytvořeny nové prázdné "
 "soubory adresáře."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Nelze provést konverzi adresáře a vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Nelze provést konverzi adresáře a vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 msgid "Address Book Conversion Error"
 msgstr "Chyba při konverzi adresáře"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 msgid "Address Book Conversion"
 msgstr "Konverze adresáře"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresář"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Skupina"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Složka"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1199,15 +1195,15 @@ msgstr "Obecné adresy"
 msgid "Personal address"
 msgstr "Osobní adresy"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Poznámka"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Varování"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Chyba"
 
@@ -1250,7 +1246,7 @@ msgstr "Hnědá"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Nespecifikováno"
 
@@ -1581,8 +1577,8 @@ msgstr "Zpráva: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Nelze získat část ze zprávy s více částmi."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Bez předmětu)"
 
@@ -1774,7 +1770,7 @@ msgstr "Typ MIME"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Velikost"
 
@@ -2015,12 +2011,12 @@ msgstr "Upravit složku"
 msgid "Input the new name of folder:"
 msgstr "Zadejte prosím nový název složky:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Nová složka"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Zadejte prosím název nové složky:"
 
@@ -2163,7 +2159,7 @@ msgstr "Export"
 msgid "Specify source folder and destination file."
 msgstr "Zadejte prosím zdrojovou složku a cílový soubor."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 msgid "File format:"
 msgstr "Formát souboru:"
 
@@ -2175,7 +2171,7 @@ msgstr "Zdrojová složka:"
 msgid "Destination:"
 msgstr "Cíl:"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr "UNIX mbox"
 
@@ -2187,7 +2183,7 @@ msgstr "eml (číslo + .eml)"
 msgid "MH (number only)"
 msgstr "MH (pouze číslo)"
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Vybrat... "
@@ -2244,23 +2240,23 @@ msgstr "Koš"
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "Nová složka"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "\"%c\" nemůže být obsaženo v názvu složky."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Složka \"%s\" již existuje."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nelze vytvořit složku \"%s\"."
@@ -2385,31 +2381,31 @@ msgstr "Zjišťují se nové zprávy ve všech složkách..."
 msgid "Junk"
 msgstr "Nevyžádaná"
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Je vybrána složka %s\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Stahují se zprávy v %s..."
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Stáhnout všechny zprávy v \"%s\"?"
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 msgid "Download all messages"
 msgstr "Stáhnout všechny zprávy"
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Při stahování zpráv v \"%s\" se vyskytla chyba."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2419,26 +2415,26 @@ msgstr ""
 "(Pokud chcete vytvořit složku, která bude mít\n"
 "podsložky, přidejte na konec názvu \"/\".)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadejte prosím nový název pro \"%s\":"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Přejmenovat složku"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Nelze přejmenovat složku \"%s\"."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nelze přesunout složku \"%s\"."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2447,11 +2443,11 @@ msgstr ""
 "Opravdu smazat složku hledání \"%s\"?\n"
 "Skutečné zprávy nebudou vymazány."
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 msgid "Delete search folder"
 msgstr "Smazat složku hledání"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2464,20 +2460,20 @@ msgstr ""
 "\n"
 "Chcete je opravdu smazat?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nelze odstranit složku \"%s\"."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Vyprázdnit koš"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 msgid "Delete all messages in the trash folder?"
 msgstr "Smazat všechny zprávy v koši?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2486,34 +2482,34 @@ msgstr ""
 "Opravdu odstranit poštovní schránku \"%s\"?\n"
 "(Zprávy NEBUDOU smazány z disku.)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "Odstranit poštovní schránku"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Opravdu smazat účet IMAP4 \"%s\"?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "Smazat účet IMAP4"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Opravdu smazat diskusní skupinu \"%s\"?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Smazat diskusní skupinu"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Opravdu smazat účet diskusních skupin \"%s\"?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Smazat účet diskusních skupin"
 
@@ -2525,8 +2521,8 @@ msgstr "Diskusní skupiny:"
 msgid "Creating header view...\n"
 msgstr "Vytváří se náhled záhlaví...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(není znám odesílatel)"
 
@@ -2538,60 +2534,60 @@ msgstr "Vytváří se náhled obrázku...\n"
 msgid "Can't load the image."
 msgstr "Nelze nahrát obrázek."
 
-#: src/import.c:185
+#: src/import.c:187
 msgid "The source file does not exist."
 msgstr "Zdrojový soubor neexistuje."
 
-#: src/import.c:196
+#: src/import.c:198
 msgid "Can't find the destination folder."
 msgstr "Nelze nalézt cílovou složku."
 
-#: src/import.c:201
+#: src/import.c:203
 #, c-format
 msgid "Importing %s ..."
 msgstr "Importuje se %s..."
 
-#: src/import.c:203
+#: src/import.c:205
 msgid "Importing"
 msgstr "Importuje se"
 
-#: src/import.c:222
+#: src/import.c:224
 msgid "Scanning folder..."
 msgstr "Prohledává se složka..."
 
-#: src/import.c:233
+#: src/import.c:235
 msgid "Error occurred on import."
 msgstr "Během importu se vyskytla chyba."
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Import"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 msgid "Specify source file and destination folder."
 msgstr "Zadejte prosím zdrojový soubor a cílovou složku."
 
-#: src/import.c:328
+#: src/import.c:340
 msgid "Source:"
 msgstr "Zdroj:"
 
-#: src/import.c:333
+#: src/import.c:345
 msgid "Destination folder:"
 msgstr "Cílová složka:"
 
-#: src/import.c:346
+#: src/import.c:358
 msgid "eml (folder)"
 msgstr "eml (složka)"
 
-#: src/import.c:395
+#: src/import.c:407
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Zadejte prosím zdrojovou složku včetně souborů eml a cílovou složku."
 
-#: src/import.c:425
+#: src/import.c:437
 msgid "Select importing folder"
 msgstr "Vybrat složku k importu"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Vybrat soubor k importu"
 
@@ -2744,141 +2740,141 @@ msgstr "Importovat soubor LDIF do adresáře"
 msgid "Attributes"
 msgstr "Atributy"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: nových zpráv %d"
 
-#: src/inc.c:477
+#: src/inc.c:478
 msgid "Authenticating with POP3"
 msgstr "Autentizace přes POP3"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Přijímají se nové zprávy"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "V pohotovosti"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Zrušeno"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Přijímá se"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, c-format
 msgid "%d message(s) (%s) received"
 msgstr "zpráv %d, přijato (%s)"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, c-format
 msgid "no new messages"
 msgstr "žádné nové zprávy"
 
-#: src/inc.c:708
+#: src/inc.c:715
 msgid "Done"
 msgstr "Hotovo"
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Autentizace selhala"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Zamknuto"
 
-#: src/inc.c:730
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Čas vypršel"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Dokončeno (nových zpráv %d)"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Dokončeno (žádné nové zprávy)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "Během načítání zpráv se vyskytly chyby."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "získávají se nové zprávy z účtu %s...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Autentizace přes POP3"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Přijímají se nové zprávy"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Připojování k serveru POP3: %s..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nelze se spojit se serverem POP3: %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentizace..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Přijímají se zprávy z %s..."
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Zjišťuje se počet nových zpráv (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Zjišťuje se počet nových zpráv (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Zjišťuje se počet nových zpráv (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Zjišťuje se velikost zpráv (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "Vymazávání zprávy %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Ukončování"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Přijímá se zpráva (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2886,15 +2882,15 @@ msgstr ""
 "Vykonání příkazu k filtrování nevyžádané pošty selhalo.\n"
 "Zkontrolujte prosím nastavení kontroly nevyžádané pošty."
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 msgid "Connection failed."
 msgstr "Spojení selhalo."
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "Během zpracovávání pošty se vyskytla chyba."
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2903,29 +2899,29 @@ msgstr ""
 "Během zpracovávání pošty se vyskytla chyba:\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Na disku není volné místo."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "Nelze zapisovat do souboru."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "Chyba socketu."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Spojení ukončeno vzdáleným hostitelem."
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "Poštovní schránka je zamčena."
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2934,11 +2930,11 @@ msgstr ""
 "Poštovní schránka je zamčena:\n"
 "%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Autentizace selhala."
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2947,15 +2943,15 @@ msgstr ""
 "Autentizace selhala:\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Vypršel čas relace."
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "Začleňování zrušeno\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Získávají se nové zprávy z %s do %s...\n"
@@ -2969,24 +2965,20 @@ msgstr "Zadejte prosím heslo k %s na %s:"
 msgid "Input password"
 msgstr "Zadejte heslo"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Záznamový protokol"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread není v glib podporován.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použití: %s [VOLBY]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]            otevře okno psaní nové zprávy"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2996,23 +2988,23 @@ msgstr ""
 "                                otevře okno psaní zprávy se zadanými\n"
 "                                soubory jako přílohou"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive                     přijme nové zprávy"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all                 přijme nové zprávy ze všech účtů"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                        odešle všechny pozdržené zprávy"
 
-#: src/main.c:542
+#: src/main.c:554
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [složka]...          vypíše celkový počet zpráv"
 
-#: src/main.c:543
+#: src/main.c:555
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3020,47 +3012,47 @@ msgstr ""
 "  --status-full [složka]...\n"
 "                                vypíše stav každé ze složek"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open IDsložky/číslozprávy   otevře zprávu v novém okně"
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir adresář           určí adresář se soubory uživatelského "
 "nastavení"
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "  --ipcport čísloportu             určí port pro vzdálené příkazy IPC"
 
-#: src/main.c:550
+#: src/main.c:562
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                        ukončí Sylpheed"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                       režim ladění"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                        vypíše tuto nápovědu a skončí"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version                     vypíše informaci o verzi a skončí"
 
-#: src/main.c:557
+#: src/main.c:569
 #, c-format
 msgid "Press any key..."
 msgstr "Stiskněte libovolnou klávesu..."
 
-#: src/main.c:638
+#: src/main.c:694
 msgid "Filename encoding"
 msgstr "Kódování názvu souboru"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3084,19 +3076,19 @@ msgstr ""
 "\n"
 "Pokračovat?"
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "Je rozepsána zpráva. Opravdu skončit?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Pozdržené zprávy"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Některé neodeslané zprávy jsou pozdržené. Skončit nyní?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3104,16 +3096,20 @@ msgstr ""
 "GnuPG není korektně instalováno nebo je příliš staré verze.\n"
 "Podpora OpenPGP je zakázána."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "aplikace Sylpheed je již spuštěna.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 msgid "Migration of configuration"
 msgstr "Přenesení uživatelského nastavení"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3757,8 +3753,8 @@ msgstr "Vytváří se hlavní okno...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavní okno: barevné rozvržení %d bylo neúspěšné\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "hotovo.\n"
 
@@ -4016,7 +4012,7 @@ msgstr "Přílohy"
 msgid "Message View - Sylpheed"
 msgstr "Zobrazení zprávy - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nelze uložit soubor \"%s\"."
@@ -6067,19 +6063,19 @@ msgstr "Příloha"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Předmět"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Odesílatel"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Datum"
 
@@ -6089,7 +6085,7 @@ msgid "Number"
 msgstr "Číslo"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 msgid "To"
 msgstr "Příjemce"
 
@@ -6373,29 +6369,29 @@ msgstr "1 nalezená zpráva."
 msgid "%d messages found."
 msgstr "nalezených zpráv %d."
 
-#: src/query_search.c:579
-#, c-format
-msgid "Searching %s ..."
-msgstr "Prohledává se %s..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Prohledává se %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, c-format
+msgid "Searching %s ..."
+msgstr "Prohledává se %s..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Bez data)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 msgid "Save as search folder"
 msgstr "Uložit jako složku hledání"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr "Umístění:"
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 msgid "Folder name:"
 msgstr "Název složky:"
 
@@ -6441,7 +6437,7 @@ msgstr "\t\taka \"%s\"\n"
 msgid "Signature made at %s\n"
 msgstr "Podpis vytvořen v: %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Chyba při ověřování podpisu"
 
@@ -6466,7 +6462,7 @@ msgstr "O _aplikaci"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - Vzdálená poštovní schránka POP3"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "Č."
 
@@ -6493,55 +6489,55 @@ msgstr ""
 "Během relace POP3 se vyskytla chyba:\n"
 "%s"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Přijímají se záhlaví zpráv (%d / %d)..."
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 msgid "Getting the number of messages..."
 msgstr "Zjišťuje se počet zpráv..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 msgid "No message"
 msgstr "Žádná zpráva"
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, c-format
 msgid "Deleted %d messages"
 msgstr "Smazaných zpráv %d"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Ukončování..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, c-format
 msgid "Retrieved %d messages"
 msgstr "Přijatých zpráv %d"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, c-format
 msgid "Opened message %d"
 msgstr "Otevřena zpráva %d"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, c-format
 msgid "Retrieved %d message headers"
 msgstr "Přijatých záhlaví zpráv %d"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, c-format
 msgid "Retrieving message %d ..."
 msgstr "Přijímá se zpráva %d..."
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 msgid "Delete messages"
 msgstr "Smazat zprávy"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6624,66 +6620,66 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Připojování k serveru SMTP: %s..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Po příkazu QUIT se vyskytla chyba (ignorováno)"
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "Posílá se HELO..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "Autentizace"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 msgid "Sending message..."
 msgstr "Posílá se zpráva..."
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "Posílá se EHLO..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Posílá se MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Odesílání"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Posílá se RCPT TO..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Posílá se DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Posílá se zpráva (bajtů %d / %d)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr "bajtů %d / %d"
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Posílá se zpráva"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "Při posílání zprávy nastala chyba."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6692,11 +6688,11 @@ msgstr ""
 "Při odesílání zprávy nastala chyba:\n"
 "%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 msgid "Can't connect to SMTP server."
 msgstr "Nelze se spojit se serverem SMTP."
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Nelze se spojit se serverem SMTP: %s:%d"
@@ -6721,70 +6717,70 @@ msgstr "Výsledek kontroly podpisu"
 msgid "Checking signature"
 msgstr "Kontroluje se podpis"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s od \"%s\""
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Podpis nenalezen"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Podpis od \"%s\" v pořádku"
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Podpis v pořádku"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Platný podpis, ale klíč \"%s\" není důvěryhodný"
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Platný podpis (nedůvěryhodný klíč)"
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr "Platný podpis, ale vypršela platnost \"%s\""
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 msgid "Signature valid but expired"
 msgstr "Platný podpis, ale již vypršel"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr "Platný podpis, ale podepisujícímu klíči \"%s\" vypršela platnost"
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr "Platný podpis, ale podepisujícímu klíči vypršela platnost"
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr "Platný podpis, ale podepisující klíč pro \"%s\" byl odvolán"
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr "Platný podpis, ale podepisující klíč byl odvolán"
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "CHYBNÝ podpis od \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "CHYBNÝ podpis"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "Nelze vyhledat veřejný klíč k ověření podpisu"
 
@@ -6887,7 +6883,7 @@ msgstr "Přijímá se seznam diskusních skupin..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Nelze přijmout seznam diskusních skupin."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Hotovo."
 
@@ -7014,217 +7010,217 @@ msgstr "Zbyly nějaké označené. Zpracovat je?"
 msgid "Scanning folder (%s)..."
 msgstr "Prohledává se složka (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 msgid "_Search again"
 msgstr "_Hledat znovu"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Žádné další nepřečtené zprávy"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "Nebyla nalezena žádná nepřečtená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Žádné nepřečtené zprávy."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "Nebyla nalezena žádná nepřečtená zpráva. Přejít do další složky?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Žádné další nové zprávy"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "Nebyla nalezena žádná nová zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Žádné nové zprávy."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "Nebyla nalezena žádná nová zpráva. Přejít do další složky?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Žádné další označené zprávy"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "Nebyla nalezena žádná označená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Žádné označené zprávy."
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nebyla nalezena žádná označená zpráva. Hledat od začátku?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Žádné další zprávy se štítkem"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "Nebyla nalezena žádná zpráva se štítkem. Hledat od konce?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Žádné zprávy se štítkem."
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nenalezena žádná zpráva se štítkem. Hledat od začátku?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Získávají se zprávy s předmětem..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "smazaných %d"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "přemístěných %s%d"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "zkopírovaných %s%d"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " vybraných položek"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "nových %d, nepřečtených %d, celkem %d (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "nových %d, nepřečtených %d, celkem %d"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Třídění souhrnu..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tNastavování souhrnu z dat zpráv..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Nastavování souhrnu z dat zpráv..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisování vyrovnávací paměti souhrnu (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Zpráva %d je označena\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Zpráva %d je označena jako přečtená\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Zpráva %d je označena jako nepřečtená\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Zpráva %s/%d je připravena na smazání\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Smazat zprávy"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Opravdu chcete vymazat zprávy z koše?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Vymazávání duplikovaných zpráv..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Zpráva %s/%d má zrušeno označení\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Zpráva %d je připravena na přesun do %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "Cílová položka je stejná jako aktuální složka."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 msgid "Select folder to move"
 msgstr "Vyberte složku, kterou chcete přesunout"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Zpráva %d je připravena na zkopírování do %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 msgid "Destination for copy is same as current folder."
 msgstr "Cíl kopírování je stejný jako aktuální složka."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 msgid "Select folder to copy"
 msgstr "Vyberte složku, kterou chcete kopírovat"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 msgid "Error occurred while processing messages."
 msgstr "Během zpracovávání pošty se vyskytla chyba."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Vytváří se vlákna..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Ruší se vlákna..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrování (%d / %d)..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "filtrování..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Filtrování..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "filtrovaných zpráv %d."
@@ -7315,11 +7311,11 @@ msgstr "Odeslat pozdržené z_právy"
 msgid "E_xit"
 msgstr "Ukonči_t"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
@@ -7327,18 +7323,24 @@ msgstr ""
 "Byla nalezena novější verze aplikace Sylpheed.\n"
 "Má být nyní provedena aktualizace?"
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 msgid "New version found"
 msgstr "Nalezena nová verze"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 msgid "Information"
 msgstr "Informace"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 msgid "Sylpheed is already the latest version."
 msgstr "Nejnovější verze aplikace Sylpheed je již nainstalována."
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr "Nezdařilo se získání informace o verzi."
+
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "Nelze otevřít označený soubor.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "g_thread není v glib podporován.\n"
diff --git a/po/da.po b/po/da.po
index f4550669..b03de592 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: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -18,230 +18,230 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Læs konfiguration for hver konto...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 forbindelse til %s blev afbrudt. Forbinder...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP server sti."
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "erstelle IMAP4-Verbindung zu %s:%d ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "Kan ikke starte TLS session.\n"
 
-#: libsylph/imap.c:1176
+#: libsylph/imap.c:1230
 #, fuzzy, c-format
-msgid "Getting message %d"
+msgid "Getting message %u"
 msgstr "Sletter meddelelse %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Sender meddelelse (%d / %d bytes)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Flytter meddelelse %s%c%d til %s ...\n"
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopierer meddelelse %s%c%d til %s ...\n"
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Modtager meddelelse fra %s..."
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kan ikke sætte slettede flag: %s\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "kan ikke slette\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Modtager meddelelse fra %s..."
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kan ikke sætte slettet flag: 1:%d\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Markéret fil ikke fundet.\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "fejl ved modtagelse af LIST.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "kan ikke oprette '%s'\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "kan ikke oprette '%s'\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan ikke oprette mailbox: LIST fejlet\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "kan ikke oprette mailbox\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan ikke omdøbe mailbox: %s til %s\n"
 
-#: libsylph/imap.c:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "kan ikke slette mailbox\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "kan ikke modtage kovert\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Sender meddelelse (%d / %d bytes)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "kan ikke modtage kovert\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "fejl ved modtagelse af kuvert.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kan ikke læse kuvert: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2714
+#: libsylph/imap.c:2863
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "kan ikke modtage namespace\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "fejl ved IMAP kommand: CLOSE\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 godkendelse fejlede.\n"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-Login fejlet.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan ikke tilføje %s til %s\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(sender fil...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "kan ikke tilføje meddelelse %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan ikke kopiere %s til %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "fejl ved IMAP kommando: STORE %s %s\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "fejl ved IMAP kommand: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "fejl ved IMAP kommand: CLOSE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan ikke konvertere UTF-7 til %s\n"
 
-#: libsylph/imap.c:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv can ikke konvertere %s til UTF-7\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "kan ikke skrive til midlertidig fil\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Modtager meddelelse fra %s til %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "Kan ikke læse mbox fil.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "ugyldigt mbox format: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "ugyldig mbox format: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "kan ikke åbne midlertidig fil\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -250,66 +250,62 @@ msgstr ""
 "ukodet Fra fundet:\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "kan ikke oprette lock fil %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "benyt 'flock' i stedet for 'file' hvis muligt.\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "kan ikke oprette %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "mailbox hører til anden process, venter...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "kan ikke låse %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "ugyldig lock type\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "kan ikke låse %s op\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "kan ikke tømme mailbox.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Eksporterer meddelelse fra %s til %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "kan ikke kopiere meddelelse %s til %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "Kan ikke åbne markéret fil.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "fra og til mappe er ens.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopierer meddelelse %s%c%d til %s ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -318,7 +314,7 @@ msgstr ""
 "Filen `%s' eksisterer allerede.\n"
 "Kan ikke oprette mappe."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -330,77 +326,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "oprettet NNTP forbindelse til %s:%d ...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP forbindelse til %s:%d blev afbrudt. Genforbinder...\n"
 
-#: libsylph/news.c:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "Artikel %d er allerede gemt.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "modtager artikel %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "kann ikke læse artikel %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "kan ikke sende artikel.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "kan ikke modtage artikel %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "kan ikke vælge gruppe: %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ugyldigt artikel område: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "ingen nye artikler.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "modtager XOVER %d - %d i %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "kan ikke modtage XOVER\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "fejl ved modtagelse af XOVER.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "ugyldig XOVER linie: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "kan ikke modtage XHDR\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "fejl ved modtagelse af XHDR.\n"
 
@@ -459,28 +455,28 @@ msgstr "POP3: Sletter udløben meddelelse %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Sender meddelelse (%d / %d bytes)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "postkasse er låst\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "tid udløbet\n"
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "kan ikke starte TLS session\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "fejl ved godkendelse\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 #, fuzzy
 msgid "command not supported\n"
 msgstr "Kommando tekst"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "fejl under POP3 session\n"
@@ -514,16 +510,16 @@ msgstr "Mappe"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Tegnsæt konverteringsfejl.\n"
 
-#: libsylph/procmsg.c:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "kan ikke åbne markéret fil\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kan ikke hente meddelelse %d\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Udskrift kommando er ugyldig: `%s'\n"
@@ -677,7 +673,7 @@ msgstr ""
 "Nye meddelelser bliver testet i denne rækkefølge. Afmærk\n"
 "`G'-kolonnen, for at aktivere hentning via `hent alle'."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -820,7 +816,7 @@ msgstr "Tilføj adresse i adressebog"
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Kommentar"
@@ -829,29 +825,29 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Vælg adressebog mappe"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Filer"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_Filer/Ny _adressebog"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_Filer/Ny _vCard"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/_Filer/Ny _JPilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Filer/Ny _server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -859,101 +855,101 @@ msgstr "/_Filer/Ny _server"
 msgid "/_File/---"
 msgstr "/_Filer/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_Filer/_Redigér"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_Filer/_Slet"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_Filer/_Gem"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Filer/_Luk"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Redigér"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Redigér/K_opiere"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Redigér/_Sæt ind"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Ny _adresse"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Ny _gruppe"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Ny _mappe"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/_Redigér"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Slet"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Funktioner"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hjælp/_Om"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Ny _adresse"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Ny _gruppe"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Ny _mappe"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -966,82 +962,88 @@ msgstr "/Ny _mappe"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Slet"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopier..."
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Redigér/_Sæt ind"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "E-post adresse"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adressebog"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Mappe"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "E-post adresse"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Navn:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Til:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Slet"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Tilføj"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Overblik"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 #, fuzzy
 msgid "_Close"
 msgstr "Luk"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Slet adresse(r)"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Virklig slette adresse(r)?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1050,38 +1052,38 @@ msgstr ""
 "Vil du virkeligt slette mappen OG alla adresser i `%s' ? \n"
 "Hvis kun mappen slettes, vil adresserne blive flyttet til hoved mappen."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Slet mappe"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 #, fuzzy
 msgid "_Folder only"
 msgstr "Ny mappe"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mappe og adresser"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Virklig slette `%s' ?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Ny bruger, kunne ikke gemme index fil."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Ny bruger, kunne ikke gemme adressebogs fil."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Gammel adressebog konverteret."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1089,7 +1091,7 @@ msgstr ""
 "Gammel adressebog konverteret,\n"
 "men kunne ikke gemme index filen"
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1097,7 +1099,7 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "men nye og tomme filer blev oprettet."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1105,7 +1107,7 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "kunne ikke oprette nye filer."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1113,91 +1115,85 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "kunne ikke oprette nye filer."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adressebog fejl"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Kunne ikke læse adressebog"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr "Gammel adressebog konverteret men kunne ikke gemme ny index fil "
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Kunne ikke konvertere adressebog, men har oprettet nye tomme filer "
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Kunne ikke konvertere adressebog, og heller ikke oprette nye tomme filer "
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Kunne ikke konvertere adressebog, og heller ikke oprette nye tomme filer "
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Brugerflade"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adressebog"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Gruppe"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Mappe"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -1209,15 +1205,15 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Note"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Advarsel"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Fejl"
 
@@ -1260,7 +1256,7 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Ingen"
 
@@ -1632,8 +1628,8 @@ msgstr "Meddelelse: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Intet emne)"
 
@@ -1825,7 +1821,7 @@ msgstr "MIME type"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Størrelse"
 
@@ -2073,12 +2069,12 @@ msgstr "Redigér mappe"
 msgid "Input the new name of folder:"
 msgstr "Indtast nyt gruppenavn:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Ny mappe"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Indtast ny mappes navn:"
 
@@ -2224,7 +2220,7 @@ msgstr "Eksportere"
 msgid "Specify source folder and destination file."
 msgstr "Indtast mbox fil og mappe."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Dato format"
@@ -2239,7 +2235,7 @@ msgstr "Fra sti:"
 msgid "Destination:"
 msgstr "Mål"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2251,7 +2247,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Vælg... "
@@ -2313,23 +2309,23 @@ msgstr "Slettet"
 msgid "Drafts"
 msgstr "Kladde"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "NyMappe"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' kan ikke benyttes i mappe navn."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen `%s' eksisterer allerede."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan ikke oprette mappe `%s'."
@@ -2461,32 +2457,32 @@ msgstr "Henter nye meddelelser i alle mapper..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappe %s er valgt\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sende meddelelse..."
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Sende meddelelse..."
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 #, fuzzy
 msgid "Download all messages"
 msgstr "Sende meddelelse..."
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2496,26 +2492,26 @@ msgstr ""
 "(hvis du vil oprette mappe til undermapper,,\n"
 "så afslut navn med `/')"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nyt navn for `%s':"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Omdøb mappe"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2524,12 +2520,12 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2540,21 +2536,21 @@ msgstr ""
 "Alle mapper og meddelelser i `%s' vil blive slettet.\n"
 "Vil du virkelig slette?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Tøm Slettet"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2563,34 +2559,34 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Virklig slette IMAP4 konto `%s'?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "Slet IMAP4 konto"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Virklig slette nyhedsgruppe `%s'?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Slet nyhedsgruppe"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Virklig slette nyheds konto `%s'?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Slet nyheds konto"
 
@@ -2602,8 +2598,8 @@ msgstr "Nyhedsgrupper:"
 msgid "Creating header view...\n"
 msgstr "Opretter hoved visning...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Ingen Fra)"
 
@@ -2615,71 +2611,71 @@ msgstr "Opretter billed visning...\n"
 msgid "Can't load the image."
 msgstr "Kan ikke læse billede."
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Filen %s findes ikke\n"
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Indtast mbox fil og mappe."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Gennemsøger mappe %s ..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Importere"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Gennemsøger mappe %s ..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Fejl ved afsendelse\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Importere"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Indtast mbox fil og mappe."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Fra sti:"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Til sti:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Ny mappe"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Indtast mbox fil og mappe."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Vælg fil til import"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Vælg fil til import"
 
@@ -2840,161 +2836,161 @@ msgstr "Importer LDIF fil til adressebog"
 msgid "Attributes"
 msgstr "Egenskaber"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Hentet (%d nye meddelelse(r))"
 
-#: src/inc.c:477
+#: src/inc.c:478
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Godkender"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Modtager nu meddelelse"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "Vent"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Afbrudt"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Modtager"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Hentet (%d meddelelse(r) (%s)"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Ingen nye meddelelser."
 
-#: src/inc.c:708
+#: src/inc.c:715
 msgid "Done"
 msgstr "Afsluttet"
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Forbindelse mislykkedes"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Godkendelse mislykkedes"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Låst"
 
-#: src/inc.c:730
+#: src/inc.c:737
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Hentet (%d nye meddelelse(r))"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Ingen nye meddelelser"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "Fejl ved hentning af e-post."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "modtager nye meddelelser fra konto %s...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Godkender"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: henter nye meddelelser"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Forbinder til POP3 server: %s ..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ingen forbindelse med POP3 server: %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Godkender..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Modtager meddelelse fra %s..."
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Modtager antal nye meddelelser (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Modtager antal nye meddelelser (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Modtager antal nye meddelelser (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Modtager antal nye meddelelser (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "Sletter meddelelse %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Afslutter"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Modtager meddelelse (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 #, fuzzy
 msgid "Connection failed."
 msgstr "Forbindelse mislykkedes"
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 #, fuzzy
 msgid "Error occurred while processing mail."
 msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3003,30 +2999,30 @@ msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Ingen fri disk plads."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "Kan ikke skrive til fil."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "Sokkel fejl."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "postkasse er låst\n"
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3035,11 +3031,11 @@ msgstr ""
 "Mailbox er låst:\n"
 "%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Godkendelses fejlede."
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3048,16 +3044,16 @@ msgstr ""
 "Godkendelsesfejl:\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 #, fuzzy
 msgid "Session timed out."
 msgstr "tid udløbet\n"
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "Hentning afbrudt\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Modtager nye meddelelser fra %s til %s...\n"
@@ -3071,24 +3067,20 @@ msgstr "Indtast adgangskode for %s på %s:"
 msgid "Input password"
 msgstr "Indtast adgangskode"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Protokol log"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread er ikke understøttet i glib.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Bruges som: %s [OPTION]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    åbner nyt meddelelses vindue"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3098,23 +3090,23 @@ msgstr ""
 "                         åbn ny meddelelse med disse filer vedhæftet\n"
 "                         ."
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              modtager nye meddelelser"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          modtager nye meddelelser fra alle konti"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 send alle meddelelser i kø"
 
-#: src/main.c:542
+#: src/main.c:554
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mappe]...   viser antal meddelelser"
 
-#: src/main.c:543
+#: src/main.c:555
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3122,49 +3114,49 @@ msgstr ""
 "  --status-full [mappe]...\n"
 "                         viser status for hver mappe"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:550
+#: src/main.c:562
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                debug mode"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug mode"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 viser denne hjælp"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              viser version og afslutter"
 
-#: src/main.c:557
+#: src/main.c:569
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "eller tast `y'.\n"
 "\n"
 
-#: src/main.c:638
+#: src/main.c:694
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Udgående tegnsæt"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3178,19 +3170,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "Du er ved at skrive ny meddelelse. Virklig afslutte?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Meddeleser i kø"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Nogle usendte meddelelser i kø. Afslut nu?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3198,17 +3190,21 @@ msgstr ""
 "GnuPG er ike korrekt installeret eller i for gammel version\n"
 "OpenPGP ikke mulig."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "sylpheed kører allerede.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Handlingsopsæt"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3896,8 +3892,8 @@ msgstr "Opretter hoved vindue...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HovedVindue: fejl i farve %d\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "Afsluttet.\n"
 
@@ -4140,7 +4136,7 @@ msgstr "Vedhæftet"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan ikke gemme fil `%s'."
@@ -6288,19 +6284,19 @@ msgstr "Vedhæftet"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Emne"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Fra"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Dato"
 
@@ -6310,7 +6306,7 @@ msgid "Number"
 msgstr "Nummer"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 #, fuzzy
 msgid "To"
 msgstr "Til:"
@@ -6612,31 +6608,31 @@ msgstr "%d meddelelse fundet.\n"
 msgid "%d messages found."
 msgstr "%d meddelelse fundet.\n"
 
-#: src/query_search.c:579
-#, fuzzy, c-format
-msgid "Searching %s ..."
-msgstr "Gennemsøger mappe %s ..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrering..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, fuzzy, c-format
+msgid "Searching %s ..."
+msgstr "Gennemsøger mappe %s ..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Ingen dato)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Gennemsøg mappe"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 #, fuzzy
 msgid "Location:"
 msgstr "Afbryd handling"
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 #, fuzzy
 msgid "Folder name:"
 msgstr "Fil navn"
@@ -6687,7 +6683,7 @@ msgstr ""
 msgid "Signature made at %s\n"
 msgstr "Underskrift fra %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Fejl ved verificering af underskrift"
 
@@ -6716,7 +6712,7 @@ msgstr "Om"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Slet mappe"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "Nr."
 
@@ -6742,58 +6738,58 @@ msgid ""
 "%s"
 msgstr "fejl under POP3 session\n"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Sender meddelelse (%d / %d bytes)"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Modtager antal nye meddelelser (STAT)..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 #, fuzzy
 msgid "No message"
 msgstr "Ingen nye meddelelser."
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Slet meddelelse(er)"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Afslutter..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Modtager nu meddelelse"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Sende meddelelse"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Modtager nu meddelelse"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Modtager meddelelse fra %s..."
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 #, fuzzy
 msgid "Delete messages"
 msgstr "Slet meddelelse(er)"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6871,70 +6867,70 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Forbindelse med SMTP server: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 #, fuzzy
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Fejl ved afsendelse af e-post."
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "Sender HELO..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "Godkender"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 msgid "Sending message..."
 msgstr "Sende meddelelse..."
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "Sender EHLO..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Sender MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Sender"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Sender RCPT TO..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Sender DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Sender meddelelse (%d / %d bytes)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr ""
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Sende Meddelelse"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 #, fuzzy
 msgid "Error occurred while sending the message."
 msgstr ""
 "Fejl ved afsendelse meddelelse:\n"
 "%s"
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6943,12 +6939,12 @@ msgstr ""
 "Fejl ved afsendelse meddelelse:\n"
 "%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 #, fuzzy
 msgid "Can't connect to SMTP server."
 msgstr "Ingen forbindelse til SMTP server: %s:%d\n"
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, fuzzy, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Ingen forbindelse til SMTP server: %s:%d\n"
@@ -6976,71 +6972,71 @@ msgstr "Vis signatur check resultat i separat vindue"
 msgid "Checking signature"
 msgstr "Undersøger signatur"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s fra \"%s\""
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Underskrift ikke fundet"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "God underskrift fra \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Underskrift OK"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr ""
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 #, fuzzy
 msgid "Signature valid but expired"
 msgstr "Underskrift fra %s\n"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr ""
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr ""
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr ""
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr ""
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "DÅRLIG underskrift fra \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "DÅRLIG underskrift"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "Ingen offentlig nøgle til verificering af denne underskrift"
 
@@ -7139,7 +7135,7 @@ msgstr "Kan ikke modtage gruppe liste."
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan ikke modtage gruppe liste."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Afsluttet."
 
@@ -7270,224 +7266,224 @@ msgstr "Nogle markéringer er tilbage. Bearbejde dem?"
 msgid "Scanning folder (%s)..."
 msgstr "Søger mappe (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 #, fuzzy
 msgid "_Search again"
 msgstr "Søg igen"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Ikke flere ulæste meddelelser"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "Ingen ulæste meddelelser fundet. Søg fra slutning?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Ingen ulæste meddelelser."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "Ingen ulæste meddeleleser fundet. Fortsæt til næste mappe?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Ikke flere nye meddelelser"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "Ingen nye meddelelser fundet. Søg fra slutning?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Ingen nye meddelelser."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "Ingen nye meddeleleser fundet. Fortsæt til næste mappe?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Ikke flere ulæste meddelelser"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "Ingen markérede meddelelser fundet. Søg bagfra?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Ingen markérede eddelelser."
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "Ingen markérede meddelelser fundet. Søg forfra?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Ikke flere markérede eddelelser"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "Ingen markérede meddelelser funder. Søg bagfra?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Ingen markérede meddelelser."
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Ingen markérede meddelelser fundet. Søg forfra?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Samler meddelelser via Emne..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d slettet"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d flyttet"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopieret"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " valgte"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nye, %d ulæst, %d total (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nye, %d ulæste, %d total"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Sorterer oversigt..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tOpretter oversigt ud fra meddelelses data..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Opretter oversigt ud fra meddelelses data..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Skriver oversigt (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Meddelelse %d er markéret\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Meddelelse %d er markéret som læst\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Meddelelse %d er markéret som ulæst\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Meddelelse %s/%d er markéret til sletning\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Slet meddelelse(er)"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Vil du virkelig slette meddelelse(r) fra Slettet?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Sletter dublikerede meddelelser..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Meddelelse %s/%d er ikke markéret.\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Meddelelse %d er markéret til flytning til %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "Fra og til mappe er ens"
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Vælg mappe"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Meddelelse %d er markéret til kopiering til %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Fra og til mappe er ens."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Vælg mappe"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Opretter tråde"
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Fjerner tråde"
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "filtrering..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "meddelelse %d er allerede gemt.\n"
@@ -7583,36 +7579,42 @@ msgstr "Sender meddelelse(r) i kø"
 msgid "E_xit"
 msgstr "Afslut"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Gl. Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "Underskrift ikke fundet"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "Server data"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "sylpheed kører allerede.\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "Kan ikke åbne markéret fil.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "g_thread er ikke understøttet i glib.\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "Importerer fil:"
 
diff --git a/po/de.po b/po/de.po
index d427ee4d..8219121f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+0900\n"
 "PO-Revision-Date: 2007-09-29 23:16+0100\n"
 "Last-Translator: Joo Martin <debian@joomart.de>\n"
 "Language-Team: de\n"
@@ -20,226 +20,226 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Lese alle Einstellungen für jeden Account...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-Verbindung zu %s wurde unterbrochen. Verbinde erneut...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP-Server verhindert LOGIN.\n"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "erstelle IMAP4-Verbindung zu %s:%d ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "Kann TLS-Sitzung nicht beginnen.\n"
 
-#: libsylph/imap.c:1176
-#, c-format
-msgid "Getting message %d"
+#: libsylph/imap.c:1230
+#, fuzzy, c-format
+msgid "Getting message %u"
 msgstr "Hole Nachricht %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Hänge Nachricht an %s (%d / %d)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Verschiebe Nachrichten %s nach %s ..."
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiere Nachrichten %s nach %s ..."
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, c-format
 msgid "Removing messages %s"
 msgstr "Entferne Nachrichten von %s..."
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kann gelöschte Flags nicht setzen: %s\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "kann nicht löschen\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Entferne alle Nachrichten in %s..."
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kann gelöschte Flags nicht setzen: 1:*\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "kann Ablage nicht schließen\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "Wurzelverzeichnis %s existiert nicht\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "Fehler beim Empfang von LIST.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Kann '%s' nicht erstellen\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Kann '%s' in INBOX nicht erstellen\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kann Mailbox nicht erstellen: LIST fehlgeschlagen\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "kann Mailbox nicht erstellen\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kann Mailbox %s nicht in %s umbenennen\n"
 
-#: libsylph/imap.c:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "kann Mailbox nicht löschen\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "kann die Nachrichteneigenschaften nicht empfangen\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Hole Nachrichtenkopfzeilen (%d / %d bytes)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "kann die Nachrichteneigenschaften nicht empfangen\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "Fehler beim Empfang der Nachrichteneigenschaften.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kann die Nachrichteneigenschaften nicht bearbeiten: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Keine Verbindung mit IMAP4-Server: %s:%d\n"
 
-#: libsylph/imap.c:2714
+#: libsylph/imap.c:2863
 #, 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:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "kann Namensraum nicht empfangen\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kann Ablage %s nicht auswählen\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 msgid "error on imap command: STATUS\n"
 msgstr "Fehler beim IMAP-Befehl: STATUS\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4-Beglaubigung fehlgeschlagen.\n"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-Login fehlgeschlagen.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kann %s nicht an %s anhängen\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(Datei versenden...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kann Nachricht nicht anhängen an %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kann %s nicht nach %s kopieren\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Fehler beim IMAP-Befehl: STORE %s %s\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Fehler beim IMAP-Befehl: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "Fehler beim IMAP-Befehl: CLOSE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kann UTF-7 nicht nach %s konvertieren\n"
 
-#: libsylph/imap.c:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kann %s nicht nach UTF-7  konvertieren\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "kann nicht in temporäre Datei schreiben\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Erhaltene Nachrichten von %s in %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "Kann Mbox-Datei nicht lesen.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "Ungültiges Mbox-Format: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "zerstörte Mbox: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "kann temporäre Datei nicht öffnen\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -248,66 +248,62 @@ msgstr ""
 "uncodiertes Von gefunden:\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "kann Sperrdatei %s nicht erstellen\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "Benutze, wenn möglich, 'flock' anstatt 'file'.\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "Kann %s nicht erstellen\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "Mailbox gehört einem anderen Prozess, warten...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "kann %s nicht sperren\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "ungültiger Sperrtyp\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "kann %s nicht entperren\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "Kann Mailbox nicht auf null setzen.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportiere Nachrichten von %s in %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "kann Nachricht %s nicht nach %s kopieren\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "Kann markierte Datei nicht öffnen.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "Die Quellablage ist identisch mit dem Ziel.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopiere Nachricht %s/%d nach %s ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -316,7 +312,7 @@ msgstr ""
 "Datei '%s' existiert bereits.\n"
 "Kann Ablage nicht erstellen."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -334,77 +330,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "erstelle NNTP-Verbindung zu %s:%d ...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 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:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "Artikel %d wurde schon zwischengespeichert.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "empfange Artikel %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "kann Artikel %d nicht lesen\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "kann Artikel nicht senden.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "kann Artikel %d nicht empfangen\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "kann die Gruppe: %s nicht wählen\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ungültiger Artikelbereich: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "Keine neuen Artikel.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "bekomme Newsübersicht %d - %d in %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "kann Newsübersicht nicht bekommen\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "Fehler beim Empfang der Newsübersicht.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "ungültige Newsübersichtszeile: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "kann XHDR nicht bekommen\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "Fehler beim Empfang von XHDR.\n"
 
@@ -461,27 +457,27 @@ msgstr "POP3: Lösche abgelaufene Nachricht %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Nachricht %d überspringen (%d bytes)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "Mailbox ist blockiert\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "Sitzungszeit abgelaufen\n"
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "kann TLS-Sitzung nicht beginnen\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "Fehler während der Beglaubigung\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "Befehl wird nicht unterstützt\n"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "Fehler während einer POP3-Sitzung\n"
 
@@ -512,16 +508,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:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "kann markierte Datei nicht öffnen\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kann Nachricht %d nicht holen\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Druck-Befehlszeile ist ungültig: `%s'\n"
@@ -678,7 +674,7 @@ msgstr ""
 "Schalter\n"
 "in der 'G'-Spalte, um den Nachrichten-Empfang bei 'Hole alle' einzuschalten."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -819,7 +815,7 @@ msgstr "Adresse in Adressbuch einfügen"
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Kommentar"
@@ -828,28 +824,28 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Wähle Adressbuchablage"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datei"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_Datei/Neues Adress_buch"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_Datei/Neue _vCard"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/_Datei/Neues _JPilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datei/Neuer _LDAP-Server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -857,100 +853,100 @@ msgstr "/_Datei/Neuer _LDAP-Server"
 msgid "/_File/---"
 msgstr "/_Datei/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_Datei/_Bearbeiten"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_Datei/_Löschen"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_Datei/_Speichern"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datei/S_chließen"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Bearbeiten/_Einfügen"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Neue _Adresse"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Neue _Gruppe"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Neue Ab_lage"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/_Bearbeiten"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Werkzeug"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Werkzeug/Importiere _LDIF-Datei"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Werkzeug/Importiere _CSV-Datei"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Neue _Adresse"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Neue _Gruppe"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Neue Ab_lage"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -963,79 +959,85 @@ msgstr "/Neue Ab_lage"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Löschen"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 msgid "/_Copy"
 msgstr "/_Kopieren"
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 msgid "/_Paste"
 msgstr "/_Einfügen"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "E-Mail Adresse"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adressbuch"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Ablage"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "E-Mail Adresse"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Name:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "An:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Vorschau"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 msgid "_Close"
 msgstr "_Schließen"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Adresse(n) löschen"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Adresse(n) wirklich löschen?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1045,36 +1047,36 @@ msgstr ""
 "Wenn Sie nur die Ablage löschen, werden die Adressen in das übergeordnete "
 "Verzeichnis verschoben."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Ablage löschen"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "_Folder only"
 msgstr "Nur Abla_ge"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "Folder and _addresses"
 msgstr "Ablage und _Adressen"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Wirklich '%s' löschen ?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Neuer Benutzer, kann Index-Datei nicht speichern."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Neuer Benutzer, kann Adressbuch-Dateien nicht speichern."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Altes Adressbuch erfolgreich konvertiert."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1082,7 +1084,7 @@ msgstr ""
 "Altes Adressbuch konvertiert,\n"
 "kann neue Adress-Index-Datei nicht speichern"
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1090,7 +1092,7 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren,\n"
 "aber erstellte neue leere Adressbuch-Dateien."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1098,7 +1100,7 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren,\n"
 "konnte neue Adressbuch-Dateien nicht erstellen."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1106,92 +1108,86 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren\n"
 "und konnte neue Adressbuch-Dateien erstellen."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 msgid "Address book conversion error"
 msgstr "Adressbuch-Konvertierungsfehler"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 msgid "Address book conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 msgid "Address Book Error"
 msgstr "Adressbuch-Fehler"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Konnte Adress-Index nicht lesen"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Altes Adressbuch konvertiert, neue Adress-Index-Datei konnte nicht "
 "gespeichert werden"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Konnte Adressbuch nicht konvertieren, erstellte aber neue leere Adressbuch "
 "Dateien."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Konnte Adressbuch nicht konvertieren, konnte neue Adressbuch Dateien nicht "
 "erstellen."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Konnte Adressbuch nicht konvertieren und konnte neue Adressbuch Dateien "
 "nicht erstellen."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 msgid "Address Book Conversion Error"
 msgstr "Adressbuch-Konvertierungsfehler"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 msgid "Address Book Conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Gruppe"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Ablage"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "LDAP-Server"
 
@@ -1203,15 +1199,15 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Notiz"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Fehler"
 
@@ -1254,7 +1250,7 @@ msgstr "Braun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Keine"
 
@@ -1585,8 +1581,8 @@ msgstr "Nachricht: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht bekommen."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
@@ -1783,7 +1779,7 @@ msgstr "MIME-Typ"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Größe"
 
@@ -2023,12 +2019,12 @@ msgstr "Ablage bearbeiten"
 msgid "Input the new name of folder:"
 msgstr "Geben Sie den neuen Namen der Ablage ein:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Neue Ablage"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen der neuen Ablage ein:"
 
@@ -2174,7 +2170,7 @@ msgstr "Exportieren"
 msgid "Specify source folder and destination file."
 msgstr "Mbox-Zieldatei und Zielverzeichnis angeben."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Datumsformat"
@@ -2189,7 +2185,7 @@ msgstr "Quellverzeichnis"
 msgid "Destination:"
 msgstr "Zielverzeichnis:"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2201,7 +2197,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Auswählen... "
@@ -2261,23 +2257,23 @@ msgstr "Papierkorb"
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "NeueAblage"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' kann nicht in den Ablagenamen integriert werden."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Die Ablage '%s' existiert bereits."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kann Ablage '%s' nicht erstellen."
@@ -2403,31 +2399,31 @@ msgstr "Alle Ablagen auf neue Nachrichten prüfen..."
 msgid "Junk"
 msgstr "Spam"
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Ablage %s ist gewählt\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Lade Nachrichten nach %s ..."
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Alle Nachrichten herunter laden unter '%s' ?"
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 msgid "Download all messages"
 msgstr "Alle Nachrichten herunter laden"
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fehler beim Herunterladen der Nachrichten in '%s' ."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2437,26 +2433,26 @@ msgstr ""
 "(wenn Sie eine Ablage zum Speichern von Unterablagen erstellen wollen,\n"
 "dann hängen Sie ein `/' an das Ende des Namens)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Neuer Name für '%s':"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Ablage umbenennen"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kann Ablage '%s' nicht umbenennen."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kann Ablage '%s' nicht verschieben."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2465,11 +2461,11 @@ msgstr ""
 "Suchablage '%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 msgid "Delete search folder"
 msgstr "Suchablage löschen"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2482,20 +2478,20 @@ msgstr ""
 "\n"
 "Wollen Sie das wirklich?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kann Ablage '%s' nicht entfernen."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Leere Papierkorb"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 msgid "Delete all messages in the trash folder?"
 msgstr "Lösche alle Nachrichten im Papierkorb?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2504,34 +2500,34 @@ msgstr ""
 "Mailbox '%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "Entferne Mailbox"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4-Account '%s' wirklich löschen?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "IMAP4-Account löschen"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Newsgroup '%s' wirklich löschen?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Newsgroup löschen"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "News-Account '%s' wirklich löschen?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "News-Account löschen"
 
@@ -2543,8 +2539,8 @@ msgstr "Newsgroups:"
 msgid "Creating header view...\n"
 msgstr "Erzeuge Kopfzeilenansicht...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Kein Von)"
 
@@ -2556,71 +2552,71 @@ msgstr "Erstelle Bilderansicht...\n"
 msgid "Can't load the image."
 msgstr "Kann das Bild nicht laden."
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Datei %s existiert nicht."
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Mbox-Zieldatei und Zielverzeichnis angeben."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Suche %s ..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Importieren"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Durchsuche Ablage %s ..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Fehler beim Senden\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Importieren"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Mbox-Zieldatei und Zielverzeichnis angeben."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Quellverzeichnis"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Zielverzeichnis:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Neue Ablage"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Mbox-Zieldatei und Zielverzeichnis angeben."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Wähle importierte Datei"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Wähle importierte Datei"
 
@@ -2774,142 +2770,142 @@ msgstr "Importiere LDIF-Datei in Adressbuch"
 msgid "Attributes"
 msgstr "Eigenschaften"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d neue Nachricht(en)"
 
-#: src/inc.c:477
+#: src/inc.c:478
 msgid "Authenticating with POP3"
 msgstr "Beglaubigen mit POP3"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Empfange neue Nachricht"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "Warten"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Empfange"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Fertig (%d Nachricht(en) (%s) empfangen)"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Keine neuen Nachrichten."
 
-#: src/inc.c:708
+#: src/inc.c:715
 #, fuzzy
 msgid "Done"
 msgstr "Fertig."
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Beglaubigung fehlgeschlagen"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Blockiert"
 
-#: src/inc.c:730
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Timeout"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Beendet (%d neue Nachricht(en))"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Beendet (keine neuen Nachrichten)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "Fehler während des Empfanges der E-Mails."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "erhalte neue Nachrichten vom Account %s...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Beglaubigen mit POP3"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Empfange neue Nachrichten"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Verbinde mit POP3-Server: %s..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Keine Verbindung mit POP3-Server: %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Beglaubigen..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Erhaltene Nachrichten von %s..."
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "Lösche Nachricht %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Beenden"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Empfange Nachricht (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2917,15 +2913,15 @@ msgstr ""
 "Ausführung des Spamfilter-Kommandos fehlgeschlagen.\n"
 "Bite überprüfen Sie die Spamfilter-Einstellungen."
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 msgid "Connection failed."
 msgstr "Verbindung fehlgeschlagen."
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "Fehler beim Verarbeiten der E-Mail."
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2934,29 +2930,29 @@ msgstr ""
 "Fehler beim Verarbeiten der E-Mail:\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Kein Platz mehr auf der Festplatte."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "Kann Datei nicht schreiben."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "Socket-Fehler."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Verbindung geschlossen vom Remote-Host."
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "Mailbox ist blockiert."
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2965,11 +2961,11 @@ msgstr ""
 "Mailbox ist gesperrt:\n"
 "%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Beglaubigung fehlgeschlagen."
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2978,15 +2974,15 @@ msgstr ""
 "Beglaubigung fehlgeschlagen:\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Sitzungszeit abgelaufen."
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "Empfangen abgebrochen\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Erhalte neue Nachrichten von %s in %s...\n"
@@ -3000,24 +2996,20 @@ msgstr "Kennwort für %s auf %s angeben:"
 msgid "Input password"
 msgstr "Kennwort eingeben"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Mitschrift des Protokolls"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread wird nicht unterstützt von Glib.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Aufruf: %s [OPTION]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [Adresse]    öffnet Verfassenfenster"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3027,23 +3019,23 @@ msgstr ""
 "                         öffne Verfassen-Fenster mit angegebenen Dateien\n"
 "                         angehängt"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              empfängt neue Nachrichten"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          empfängt neue Nachrichten von allen Accounts"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 sendet alle Nachrichten aus der Warteschlange"
 
-#: src/main.c:542
+#: src/main.c:554
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [Ablage]...   zeigt die Gesamtzahl aller Nachrichten"
 
-#: src/main.c:543
+#: src/main.c:555
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3051,47 +3043,47 @@ msgstr ""
 "  --status-full [Ablage]...\n"
 "                         zeigt die Gesamtzahl aller Nachrichten"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open OrdnerID/msgnum öffnet Nachrichten in neuem Fenster"
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "··--configdir·dirname····gib das Verzeichnis an, in dem die "
 "Konfigurationsdateien gespeichert werden"
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "  --ipcport portnum      definiert Port für \"IPC remote\" Befehle"
 
-#: src/main.c:550
+#: src/main.c:562
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                Beende Sylpheed"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                Fehlersuche"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 diese Hilfe"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              gibt Version aus und beendet"
 
-#: src/main.c:557
+#: src/main.c:569
 #, c-format
 msgid "Press any key..."
 msgstr "Drücken Sie eine Taste"
 
-#: src/main.c:638
+#: src/main.c:694
 msgid "Filename encoding"
 msgstr "Dateiname Zeichensatz"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3115,19 +3107,19 @@ msgstr ""
 "\n"
 "Weiter?"
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "Verfasste Nachricht existiert. Wirklich beenden?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Wartende Nachrichten"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Einige ungesendete Nachrichten vorhanden. Jetzt beenden?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3135,16 +3127,20 @@ msgstr ""
 "GnuPG is nicht richtig installiert, oder die Version ist zu alt.\n"
 "OpenPGP-Unterstützung ausgeschaltet"
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "Ein anderes Sylpheed läuft schon.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 msgid "Migration of configuration"
 msgstr "Konfigurationsmigration"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3794,8 +3790,8 @@ msgstr "Erstelle Hauptfenster...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Haupt-Fenster: Bereitstellung von Farbe %d fehlgeschlagen\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "Fertig.\n"
 
@@ -4052,7 +4048,7 @@ msgstr "Anhänge"
 msgid "Message View - Sylpheed"
 msgstr "Nachrichtenansich - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kann Datei `%s' nicht speichern."
@@ -6124,19 +6120,19 @@ msgstr "Anhang"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Betreff"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Von"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Datum"
 
@@ -6146,7 +6142,7 @@ msgid "Number"
 msgstr "Nummer"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 msgid "To"
 msgstr "An"
 
@@ -6434,29 +6430,29 @@ msgstr "%d Nachrichten gefunden.\n"
 msgid "%d messages found."
 msgstr "%d Nachrichten gefunden.\n"
 
-#: src/query_search.c:579
-#, c-format
-msgid "Searching %s ..."
-msgstr "Suche %s ..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Suche %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, c-format
+msgid "Searching %s ..."
+msgstr "Suche %s ..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Kein Datum)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 msgid "Save as search folder"
 msgstr "Speichern in Suchablage"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr "Speicherort:"
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 msgid "Folder name:"
 msgstr "Ablage Name:"
 
@@ -6502,7 +6498,7 @@ msgstr "\t\taka \"%s\"\n"
 msgid "Signature made at %s\n"
 msgstr "Digitale Unterschrift erstellt %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Fehler beim Verifizieren der digitalen Unterschrift"
 
@@ -6530,7 +6526,7 @@ msgstr "_Über"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Entferne Mailbox"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "Nr."
 
@@ -6556,58 +6552,58 @@ msgid ""
 "%s"
 msgstr "Fehler während einer POP3-Sitzung\n"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Hole Nachrichtenkopfzeilen (%d / %d bytes)"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (STAT)..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 #, fuzzy
 msgid "No message"
 msgstr "Keine neuen Nachrichten."
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Nachricht(en) löschen"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Beende..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Empfange neue Nachricht"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Sende Nachricht"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Empfange neue Nachricht"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Erhaltene Nachrichten von %s..."
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 #, fuzzy
 msgid "Delete messages"
 msgstr "Nachricht(en) löschen"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6689,66 +6685,66 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Verbindung mit SMTP-Server: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Fehler aufgetreten nach dem \"Beenden\" Befehl (ignoriert)"
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "Sende HELO..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "Beglaubigen"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 msgid "Sending message..."
 msgstr "Sende Nachricht..."
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "Sende EHLO..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Sende MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Sende"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Sende RCPT TO..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Sende DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Sende Nachricht (%d / %d bytes)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr ""
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Sende Nachricht"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "Fehler aufgetreten beim Senden der Nachricht."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6757,12 +6753,12 @@ msgstr ""
 "Fehler beim Senden der Nachricht aufgetreten:\n"
 "%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 #, fuzzy
 msgid "Can't connect to SMTP server."
 msgstr "keine Verbindung mit NNTP-Server: %s:%d\n"
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, fuzzy, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "keine Verbindung mit NNTP-Server: %s:%d\n"
@@ -6787,79 +6783,79 @@ msgstr "Zeige das Ergebnis der Prüfung der digitalen Unterschrift an"
 msgid "Checking signature"
 msgstr "Digitale Unterschrift überprüfen"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s von \"%s\""
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Keine digitale Unterschrift gefunden"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Gute digitale Unterschrift von \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Gute digitale Unterschrift"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 "Gültige digitale Unterschrift, aber dem Schlüssel für  \"%s\" wird nicht "
 "vertraut."
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Gültige digitale Unterschrift (Schlüssel wird nicht vertraut)"
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr "Gültige digitale Unterschrift, aber abgelaufen für \"%s\""
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 msgid "Signature valid but expired"
 msgstr "Gültige digitale Unterschrift, aber abgelaufen"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr ""
 "Gültige digitale Unterschrift, aber der verwendete Schlüssel für \"%s\" ist "
 "abgelaufen"
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr ""
 "Gültige digitale Unterschrift, aber der verwendete Schlüssel ist abgelaufen"
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr ""
 "Gültige digitale Unterschrift, aber der verwendete Schlüssel für \"%s\" "
 "wurde zurückgezogen"
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr ""
 "Gültige digitale Unterschrift, aber der verwendete Schlüssel wurde "
 "zurückgezogen"
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "SCHLECHTE digitale Unterschrift von \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "SCHLECHTE digitale Unterschrift"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr ""
 "Kein öffentlicher Schlüssel zum Verifizieren der digitalen Unterschrift"
@@ -6966,7 +6962,7 @@ msgstr "Hole Newsgroup-Liste..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Kann die Newsgroup-Liste nicht empfangen."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Fertig."
 
@@ -7093,219 +7089,219 @@ msgstr "Einige Markierungen sind übrig. Verarbeiten?"
 msgid "Scanning folder (%s)..."
 msgstr "Durchsuche Ablage (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 msgid "_Search again"
 msgstr "Weiter_suchen"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Keine weiteren ungelesenen Nachrichten"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "Keine ungelesene Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Keine ungelesenen Nachrichten."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "Keine ungelesene Nachricht gefunden. Gehe zu nächster Ablage?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Keine weiteren neuen ungelesenen Nachrichten"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "Keine neue Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Keine neuen Nachrichten."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "Keine neue Nachricht gefunden. Gehe zu nächster Ablage?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Keine weiteren ungelesenen Nachrichten"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "Keine markierte Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Keine markieten Nachrichten."
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "Keine markierte Nachricht gefunden. Vom Anfang suchen?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Keine weiteren etikettierten Nachrichten"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "Keine etikettierte Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Keine etikettierten Nachrichten."
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Keine etikettierte Nachricht gefunden. Vom Anfang suchen?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Ziehe Nachrichten nach Betreff an..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d gelöscht"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verschoben"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopiert"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " Einträge gewählt"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Sortiere Ablagenansicht..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tErstelle Ablageninhalt aus Nachrichtendaten"
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Erstelle Ablageninhalt aus Nachrichtendaten..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Schreibe Ablageninhaltszwischenspeicher (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Nachricht %d ist markiert.\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Nachricht %d ist markiert als gelesen\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Nachricht %d ist markiert als ungelesen\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Nachricht %s/%d ist zum Löschen markiert\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Nachricht(en) löschen"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Wollen Sie wirklich diese Nachricht(en) aus dem Papierkorb löschen?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Lösche mehrfach vorhandene Nachrichten..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Nachricht %s/%d ist nicht markiert.\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Nachricht %d ist markiert zum Verschieben nach %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "Das Ziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Wähle Ablage"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Nachricht %d ist markiert zum Kopieren nach %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 msgid "Destination for copy is same as current folder."
 msgstr "Das Kopierziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Wähle Ablage"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 msgid "Error occurred while processing messages."
 msgstr "Fehler beim Verarbeiten der Nachrichten."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Threads erstellen..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Threads aufheben..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtern (%d / %d)..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "filtern..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Filtern..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Es wurde(n) %d Nachricht(en) gefiltert."
@@ -7398,35 +7394,41 @@ msgstr "_Senden wartender Nachrichten"
 msgid "E_xit"
 msgstr "Be_enden"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "Keine digitale Unterschrift gefunden"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "Serverdaten"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "Ein anderes Sylpheed läuft schon.\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "Kann markierte Datei nicht öffnen.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "g_thread wird nicht unterstützt von Glib.\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "Importiere Datei:"
 
diff --git a/po/el.po b/po/el.po
index 6b7d495d..8611b4a0 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.0beta5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+0900\n"
 "PO-Revision-Date: 2007-03-17 00:57+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -21,297 +21,293 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Ανάγνωση ρυθμίσεων λογαριασμών...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Η IMAP4 σύνδεση στο %s διακόπηκε. Επανασύνδεση...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Ο διακομιστής IMAP4 απενεργοποίησε το LOGIN.\n"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "Δημιουργία σύνδεσης IMAP4 στο %s:%d ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "Δεν είναι δυνατό να ξεκινήσει συνεδρία TLS.\n"
 
-#: libsylph/imap.c:1176
-#, c-format
-msgid "Getting message %d"
+#: libsylph/imap.c:1230
+#, fuzzy, c-format
+msgid "Getting message %u"
 msgstr "Λήψη μηνύματος %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Μετακίνηση μηνυμάτων στο %s"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Μετακίνηση μηνυμάτων %s στο %s ..."
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Αντιγραφή μηνυμάτων %s στο %s ..."
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, c-format
 msgid "Removing messages %s"
 msgstr "Διαγραφή μηνυμάτων %s"
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "Αποτυχία ορίσματος του PAM_TTY=%s"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "δεν μπορώ να τα απαλείψω\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Διαγραφή όλων των μηνυμάτων στο %s"
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "Αποτυχία ορίσματος του PAM_TTY=%s"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "δεν είναι δυνατό το κλείσιμο του φακέλου\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "Ο ριζικός φάκελος %s δεν υπάρχει.\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "προέκυψε σφάλμα κατά τη λήψη της λίστας.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Δεν είναι δυνατή η δημιουργία του '%s'\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Δεν είναι δυνατή η δημιουργία του '%s' μέσα στο INBOX\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr ""
 "δεν είναι δυνατή η δημιουργία γραμματοκιβωτίου: η εντολή LIST απέτυχε\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "δεν είναι δυνατή η δημιουργία γραμματοκιβωτίου\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "Δεν είναι δυνατή η μετονομασία του γραμματοκιβωτίου: %s σε %s\n"
 
-#: libsylph/imap.c:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "δεν μπορώ να διαγράψω το mailbox\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "δεν είναι δυνατή η λήψη του φακέλου\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Εμφάνιση Όλων των _Κεφαλίδων"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "δεν είναι δυνατή η λήψη του φακέλου\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "δημιουργήθηκε σφάλμα κατά τη λήψη του φακέλου.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "δεν είναι δυνατή η ανάλυση του φακέλου: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Δεν είναι δυνατή η σύνδεση στον διακομιστή IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2714
+#: libsylph/imap.c:2863
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Δεν είναι δυνατή η σύνδεση στον διακομιστή IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2789
+#: libsylph/imap.c:2938
 #, fuzzy
 msgid "can't get namespace\n"
 msgstr "Αδυναμία λήψης όνοματος χρήστη"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "δεν μπορώ να επιλέξω τον κατάλογο: %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 msgid "error on imap command: STATUS\n"
 msgstr "σφάλμα στην εντολή imap: STATUS\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "Η πιστοποίηση στον IMAP4 απέτυχε.\n"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "Η είσοδος στον IMAP4 απέτυχε.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "δεν είναι δυνατή η προσάρτηση του %s στο %s\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(αποστολή αρχείου...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "Δεν είναι δυνατή η προσθήκη μηνύματος στον φάκελο `%s': %s"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "δεν είναι δυνατή η αντιγραφή του %s στο %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Error while spawning the mbadblocks command: %s."
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4184
 #, fuzzy
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Error while spawning the mbadblocks command: %s."
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "Error while spawning the mbadblocks command: %s."
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "Δεν είναι δυνατή η μετατροπή του UTF-7 σε %s από το iconv\n"
 
-#: libsylph/imap.c:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "Δεν είναι δυνατή η μετατροπή του %s σε UTF-7 από το iconv\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "δεν είναι δυνατή η εγγραφή στο προσωρινό αρχείο\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, fuzzy, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Μετακίνηση μηνυμάτων στο φάκελο %s"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "δεν είναι δυνατή η ανάγνωση από το αρχείο mbox.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "μη έγκυρη μορφή mbox: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "κακοσχηματισμένο mbox: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "δεν είναι δυνατό το άνοιγμα του προσωρινού αρχείου\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, fuzzy, c-format
 msgid ""
 "unescaped From found:\n"
 "%s"
 msgstr "Το αρχείο δε βρέθηκε."
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "δεν είναι δυνατή η δημιουργία αρχείου κλειδώματος %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr ""
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "δεν είναι δυνατή η δημιουργία του %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "το γραμματοκιβώτιο ανήκει σε άλλη διεργασία, αναμονή...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "δεν είναι δυνατό το κλείδωμα του %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "μη έγκυρος τύπος κλειδιού\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "δεν είναι δυνατό το ξεκλείδωμα του %s\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "δεν είναι δυνατή η περικοπή του γραμματοκιβωτίου σε μηδενικό.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Εξαγωγή μηνυμάτων από το %s στο %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "δεν μπορώ να αντιγράψω το μήνυμα %s στο %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "Δεν είναι δυνατή η σημείωση του αρχείου.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "ο φάκελος προορισμού είναι ο ίδιος με τον αρχικό.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Αντιγραφή μηνύματος %s%c%d στο %s ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -320,7 +316,7 @@ msgstr ""
 "Το αρχείο '%s' υπάρχει ήδη.\n"
 "Δεν είναι δυνατή η δημιουργία του φακέλου."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -339,77 +335,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "δημιουργώ NNTP σύνδεση στο %s:%d ...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "Η NNTP σύνδεση στο %s:%d διακόπηκε. Επανασύνδεση...\n"
 
-#: libsylph/news.c:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "το άρθρο %d υπάρχει ήδη στην προσωρινή μνήμη.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "λήψη άρθρου %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "δεν είναι δυνατή η ανάγνωση του άρθρου %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "δεν μπορώ να στείλω το άρθρο.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "δεν μπορώ να λάβω το άρθρο %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "δεν είναι δυνατή η επιλογή της ομάδας: %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "μη έγκυρη ακολουθία άρθρων: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "δεν υπάρχουν νέα άρθρα.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "λαμβάνω xover %d - %d στο %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "δεν μπορώ να λάβω xover\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "συνέβη σφάλμα καθώς λάμβανα xover.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "μη έγκυρη γραμμή xover: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "δεν μπορώ να λάβω xhdr\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "συνέβη σφάλμα καθώς λάμβανα xhdr.\n"
 
@@ -467,27 +463,27 @@ msgstr "POP3: Διαγραφή ληγμένου μηνύματος %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Προσπέραση μηνύματος (%d / %d bytes)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "το γραμματοκιβώτιο είναι κλειδωμένο\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "λήξη ορίου χρόνου συνεδρίας\n"
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "δεν είναι δυνατό να ξεκινήσει συνεδρία TLS\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "προέκυψε σφάλμα κατά την πιστοποίηση\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "η εντολή δεν υποστηρίζεται\n"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "Προέκυψε σφάλμα στη συνεδρία POP3\n"
 
@@ -518,17 +514,17 @@ msgstr "Φίλτρο ανεπιθύμητης αλληλογραφίας"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Η μετατροπή του κώδικα απέτυχε.\n"
 
-#: libsylph/procmsg.c:656
+#: libsylph/procmsg.c:849
 #, fuzzy
 msgid "can't open mark file\n"
 msgstr "Δεν είναι δυνατό το άνοιγμα του αρχείου"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, fuzzy, c-format
 msgid "can't fetch message %d\n"
 msgstr "Δέν είναι δυνατή η λήψη μέρους του πολυτμηματικού μηνύματος"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, fuzzy, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr ""
@@ -690,7 +686,7 @@ msgstr ""
 "στη στήλη 'G' για να ενεργοποιήσετε τη λήψη μηνυμάτων με την εντολή 'Λήψη "
 "όλων'."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -832,7 +828,7 @@ msgstr "Προσθήκη διεύθυνσης στο ευρετήριο"
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Σχόλια"
@@ -841,28 +837,28 @@ msgstr "Σχόλια"
 msgid "Select Address Book Folder"
 msgstr "Επιλογή φακέλου από το Ευρετήριο διευθύνσεων"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Αρχείο"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_Αρχείο/Νέο ε_υρετήριο διευθύνσεων"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_Αρχείο/Νέα _vCard"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/_Αρχείο/Νέο _JPilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 msgid "/_File/New _LDAP Server"
 msgstr "/_Αρχείο/Προσθήκη νέου διακομιστή _LDAP"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -870,101 +866,101 @@ msgstr "/_Αρχείο/Προσθήκη νέου διακομιστή _LDAP"
 msgid "/_File/---"
 msgstr "/_Αρχείο/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_Αρχείο/_Επεξεργασία"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_Αρχείο/_Διαγραφή"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_Αρχείο/_Αποθήκευση"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Αρχείο/_Κλείσιμο"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Επεξεργασία"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Επεξεργασία/_Αντιγραφή"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Επεξεργασία/Ε_πικόλληση"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/_Διεύθυνση"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/_Διεύθυνση/Νέα δ_ιεύθυνση"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/_Διεύθυνση/Νέα ο_μάδα"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/_Διεύθυνση/Νέος _φάκελος"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/_Διεύθυνση/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/_Διεύθυνση/_Επεξεργασία"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/_Διεύθυνση/_Διαγραφή"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Εργαλεία"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Εργαλεία/Εισαγωγή αρχείου _LDIF"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Εργαλεία/Εισαγωγή αρχείου _LDIF"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Βοήθεια"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Βοήθεια/_Σχετικά"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Νέα δ_ιεύθυνση"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Νέα _ομάδα"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Νέος _φάκελος"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -977,79 +973,85 @@ msgstr "/Νέος _φάκελος"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Διαγραφή"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 msgid "/_Copy"
 msgstr "/_Αντιγραφή"
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 msgid "/_Paste"
 msgstr "/Ε_πικόλληση"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "Διεύθυνση ηλεκτρονικής αλληλογραφίας"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Φάκελος"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "Διεύθυνση ηλεκτρονικής αλληλογραφίας"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Όνομα:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Προς:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Κοινοποίηση:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Κρυφή κοινοποίηση:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Αναζήτηση"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Διαγραφή διεύθυνσης (διευθύνσεων)"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Θέλετε σίγουρα να διαγράψετε τις διευθύνσεις;"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1058,37 +1060,37 @@ msgstr ""
 "Θέλετε να διαγράψετε το '%s' ; Αν διαγράψετε μόνο το φάκελο, οι διευθύνσεις "
 "που περιέχει θα μετακινηθούν στον γονικό φάκελο."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Διαγραφή φακέλου"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "_Folder only"
 msgstr "_Φάκελος μόνο"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "Folder and _addresses"
 msgstr "Φάκελος και _διευθύνσεις"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Σίγουρα να διαγραφεί το '%s' ;"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Νέος χρήστης, δεν είναι δυνατή η αποθήκευση του ευρετηρίου."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr ""
 "Νέος χρήστης, δεν είναι δυνατή η αποθήκευση του ευρετηρίου διευθύνσεων."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Το παλιό ευρετήριο διευθύνσεων μετατράπηκε με επιτυχία."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 #, fuzzy
 msgid ""
 "Old address book converted,\n"
@@ -1097,7 +1099,7 @@ msgstr ""
 "Το παλιό βιβλίο διευθύνσεων μετατράπηκε επιτυχώς,\n"
 "δεν είναι δυνατή η αποθήκευση του νέου ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1105,7 +1107,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του ευρετηρίου διευθύνσεων.\n"
 "Δημιουργήθηκε νέο, κενό αρχείο."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 #, fuzzy
 msgid ""
 "Could not convert address book,\n"
@@ -1114,7 +1116,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1122,33 +1124,33 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του ευρετηρίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Σφάλμα κατά τη μετατροπή του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Μετατροπή ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Σφάλμα ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Δεν είναι δυνατή η ανάγνωση του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 #, fuzzy
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Το παλιό βιβλίο διευθύνσεων μετατράπηκε επιτυχώς,\n"
 "δεν είναι δυνατή η αποθήκευση του νέου ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 #, fuzzy
 msgid ""
 "Could not convert address book, but created empty new address book files."
@@ -1156,7 +1158,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων.\n"
 "Δημιουργήθηκε νέο, κενό αρχείο."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 #, fuzzy
 msgid ""
 "Could not convert address book, could not create new address book files."
@@ -1164,7 +1166,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 #, fuzzy
 msgid ""
 "Could not convert address book and could not create new address book files."
@@ -1172,53 +1174,47 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Σφάλμα κατά τη μετατροπή του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Μετατροπή του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Διεπαφή"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Ευρετήριο διευθύνσεων"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Άτομο"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "Διεύθυνση ηλεκτρονικής αλληλογραφίας"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Ομάδα"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Φάκελος"
-
 # Untrans.
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
 # Untans.
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "Διακομιστής LDAP"
 
@@ -1230,15 +1226,15 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Σημείωση"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -1282,7 +1278,7 @@ msgstr "Καφέ"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Κανένα"
 
@@ -1615,8 +1611,8 @@ msgstr "Μήνυμα: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Δεν είναι δυνατή η λήψη μέρους του πολυτμηματικού μηνύματος."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Χωρίς θέμα)"
 
@@ -1817,7 +1813,7 @@ msgstr "τύπος MIME"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Μέγεθος"
 
@@ -2063,12 +2059,12 @@ msgstr "Επεξεργασία φακέλου"
 msgid "Input the new name of folder:"
 msgstr "Εισάγετε το νέο όνομα του φακέλου:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Νέος φάκελος"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Εισάγετε το όνομα του νέου φακέλου:"
 
@@ -2216,7 +2212,7 @@ msgstr "Εξαγωγή"
 msgid "Specify source folder and destination file."
 msgstr "Ορίσετε το αρχείο mbox και κατάλογο προορισμού."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Μορφοποίηση ημερομηνίας"
@@ -2231,7 +2227,7 @@ msgstr "Πηγαίος κατάλογος:"
 msgid "Destination:"
 msgstr "Κατάλογος προορισμού:"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2243,7 +2239,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Επιλογή ... "
@@ -2304,23 +2300,23 @@ msgstr "Διαγραμμένα"
 msgid "Drafts"
 msgstr "Πρόχειρα"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "ΝέοςΦάκελος"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Το `%c' δεν μπορεί να συμπεριλαμβάνεται σε όνομα φακέλου."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Ο φάκελος `%s' υπάρχει ήδη."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Δεν είναι δυνατή η δημιουργία του φακέλου `%s'."
@@ -2448,32 +2444,32 @@ msgstr "Έλεγχος για νέα μηνύματα σε όλους τους �
 msgid "Junk"
 msgstr "Ανεπιθύμητη αλληλογραφία"
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Επιλέχθηκε ο φάκελος %s\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Λήψη μηνυμάτων στο %s ..."
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Λήψη μηνυμάτων στο %s ..."
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 #, fuzzy
 msgid "Download all messages"
 msgstr "Λήψη μηνυμάτων στο %s ..."
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Συνέβη σφάλμα κατά τη λήψη μηνυμάτων στο '%s'."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2483,26 +2479,26 @@ msgstr ""
 "(αν θέλετε να δημιουργήσετε ένα φάκελο για να βάλετε υποφακέλους\n"
 " προσθέστε ένα '/' στο τέλος του ονόματος)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Επιλέξτε ένα νέο όνομα για το `%s':"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Μετονομασία φακέλου"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Δεν είναι δυνατή η μετονομασία του φακέλου '%s'."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Δεν είναι δυνατή η μετακίνηση του φακέλου '%s'."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2511,11 +2507,11 @@ msgstr ""
 "Σίγουρα να διαγραφεί ο φάκελος αναζήτησης '%s' ;\n"
 "(Τα μηνύματα δε διαγράφονται από τον δίσκο)"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 msgid "Delete search folder"
 msgstr "Διαγραφή φακέλου αναζήτησης"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2528,20 +2524,20 @@ msgstr ""
 "\n"
 "Θέλετε πράγματι να τα διαγράψετε;"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Δεν είναι δυνατή η διαγραφή του φακέλου '%s'."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Άδειασμα απορριμμάτων"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 msgid "Delete all messages in the trash folder?"
 msgstr "Διαγραφή όλων των μηνυμάτων στο φάκελο απορριμμάτων;"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2550,34 +2546,34 @@ msgstr ""
 "Σίγουρα να διαγραφεί το γραμματοκιβώτιο `%s' ;\n"
 "(Τα μηνύματα ΔΕΝ σβήνονται από τον δίσκο)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "Αφαίρεση γραμματοκιβωτίου"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Να διαγραφεί ο λογαριασμός IMAP4 `%s';"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "Διαγραφή λογαριασμού IMAP4"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Να διαγραφεί η ομάδα νέων `%s';"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Διαγραφή ομάδας νέων"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Να διαγραφεί ο λογαριασμός νέων `%s';"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Διαγραφή λογαριασμού νέων"
 
@@ -2589,8 +2585,8 @@ msgstr "Ομάδες συζητήσεων:"
 msgid "Creating header view...\n"
 msgstr "Δημιουργία προβολής κεφαλίδων...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Χωρίς αποστολέα)"
 
@@ -2602,71 +2598,71 @@ msgstr "Δημιουργία προβολής εικόνας...\n"
 msgid "Can't load the image."
 msgstr "Δεν είναι δυνατό το φόρτωμα της εικόνας"
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Ορίσετε το αρχείο mbox και κατάλογο προορισμού."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Αναζήτηση για %s..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Εισαγωγή"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Σάρωση φακέλου %s ..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Προέκυψε σφάλμα κατά την αποστολή\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Εισαγωγή"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Ορίσετε το αρχείο mbox και κατάλογο προορισμού."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Πηγαίος κατάλογος:"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Κατάλογος προορισμού:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Νέος φάκελος"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Ορίσετε το αρχείο mbox και κατάλογο προορισμού."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Επέλεξε αρχείο εισαγωγής"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Επέλεξε αρχείο εισαγωγής"
 
@@ -2828,157 +2824,157 @@ msgstr "Εισαγωγή αρχείου LDIF στο ευρετήριο διευ�
 msgid "Attributes"
 msgstr "Γνωρίσματα"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d νέα μηνύματά"
 
-#: src/inc.c:477
+#: src/inc.c:478
 msgid "Authenticating with POP3"
 msgstr "Πιστοποίηση με POP3"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Λήψη νέων μηνυμάτων"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "Σε αναμονή"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Ακυρώθηκε"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Λήψη"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Ολοκληρώθηκε (%d μηνύματα (%s) παρελήφθησαν)"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Δεν υπάρχουν νέα μηνύματα."
 
-#: src/inc.c:708
+#: src/inc.c:715
 #, fuzzy
 msgid "Done"
 msgstr "Έγινε."
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Η εντολή Auth απέτυχε"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Κλειδωμένο"
 
-#: src/inc.c:730
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Όριο χρόνου"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Ολοκληρώθηκε (%d νέα μηνύματα)"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Ολοκληρώθηκε (δεν υπάρχουν νέα μηνύματα)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 #, fuzzy
 msgid "Some errors occurred while getting mail."
 msgstr "Συνέβησαν σφάλματα κατά την αποστολή των μηνυμάτων στην ουρά."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "λήψη νέων μηνυμάτων λογαριασμού %s...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Πιστοποίηση με POP3"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Λήψη νέων μηνυμάτων"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Σύνδεση με το διακομιστή POP3: %s..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Δεν μπορώ να συνδεθώ στον POP3 server: %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Πιστοποίηση..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Λήψη μηνυμάτων από %s..."
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Λήψη αριθμού νέων μηνυμάτων (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Λήψη αριθμού νέων μηνυμάτων (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Λήψη αριθμού νέων μηνυμάτων (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Λήψη μεγέθους μηνυμάτων (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "Διαγραφή μηνύματος %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Κλείνω τη σύνδεση"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Λαμβάνεται το μήνυμα (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 msgid "Connection failed."
 msgstr "Η σύνδεση απέτυχε."
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το μήνυμα."
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2987,29 +2983,29 @@ msgstr ""
 "Δημιουργήθηκε σφάλμα κατά την επεξεργασία μηνυμάτων:\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Δεν υπάρχει άλλος χώρος στο δίσκο."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "Δεν είναι δυνατή η εγγραφή του αρχείου."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "Σφάλμα σύνδεσης."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Η σύνδεση έκλεισε από τον απομακρυσμένο υπολογιστή."
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "Το γραμματοκιβώτιο είναι κλειδωμένο."
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3018,11 +3014,11 @@ msgstr ""
 "Το γραμματοκιβώτιο είναι κλειδωμένο:\n"
 "%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Η πιστοποίηση απέτυχε."
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3031,15 +3027,15 @@ msgstr ""
 "Η πιστοποίηση απέτυχε:\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Λήξη χρόνου σύνδεσης."
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "Η ενσωμάτωση ακυρώθηκε\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Λήψη μηνυμάτων από %s στο %s ...\n"
@@ -3053,24 +3049,20 @@ msgstr "Εισάγετε κωδικό για %s σε %s:"
 msgid "Input password"
 msgstr "Δώστε τον κωδικό"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Καταγραφή πρωτοκόλλου"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "το g_thread δεν υποστηρίζεται από την glib.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [διεύθυνση]  άνοιγμα παραθύρου σύνθεσης"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3080,23 +3072,23 @@ msgstr ""
 "                         άνοιγμα του παραθύρου σύνθεσης μηνύματος με\n"
 "                         τα καθορισμένα αρχεία συνημμένα"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              λήψη νέων μηνυμάτων"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          λήψη νέων μηνυμάτων όλων των λογαριασμών"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 αποστολή όλων των μηνυμάτων στην ουρά"
 
-#: src/main.c:542
+#: src/main.c:554
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [φάκελος]...  εμφάνιση του συνολικού αριθμού μηνυμάτων"
 
-#: src/main.c:543
+#: src/main.c:555
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3104,47 +3096,47 @@ msgstr ""
 "  --status-full [φάκελος]...\n"
 "                         εμφάνιση της κατάστασης του φακέλου"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --config-dir κατάλογος  ορίζει τον κατάλογο που αποθηκεύονται τα αρχεία "
 "ρυθμίσεων"
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:550
+#: src/main.c:562
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 έξοδος από το Sylpheed"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                λειτουργία αποσφαλμάτωσης"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 εμφάνιση αυτού του κειμένου και έξοδος"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              εμφάνιση της έκδοσης και έξοδος"
 
-#: src/main.c:557
+#: src/main.c:569
 #, c-format
 msgid "Press any key..."
 msgstr "Πατήστε ένα πλήκτρο..."
 
-#: src/main.c:638
+#: src/main.c:694
 msgid "Filename encoding"
 msgstr "Κωδικοποίηση ονομάτων αρχείων"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3169,19 +3161,19 @@ msgstr ""
 "\n"
 "Συνέχεια;"
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "Υπάρχει ήδη μήνυμα υπό σύνθεση. Να γίνει έξοδος;"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Μηνύματα στην ουρά"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Μερικά μηνύματα δεν έχουν σταλεί και είναι στην ουρά. Να κλείσω;"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3189,16 +3181,20 @@ msgstr ""
 "Το GnuPG δεν έχει εγκατασταθεί σωστά, ή χρειάζεται αναβάθμιση.\n"
 "Η υποστήριξη OpenPGP απενεργοποιήθηκε."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "Τρέχει ήδη ένα Sylpheed.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 msgid "Migration of configuration"
 msgstr "Μεταφορά ρυθμίσεων"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3856,8 +3852,8 @@ msgstr "Δημιουργία κύριου παραθύρου...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "έγινε.\n"
 
@@ -4119,7 +4115,7 @@ msgstr "Συνημμένα"
 msgid "Message View - Sylpheed"
 msgstr "Προβολή μηνύματος - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Δεν είναι δυνατή η αποθήκευση του αρχείου '%s'."
@@ -6187,19 +6183,19 @@ msgstr "Συνημμένο"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Θέμα"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Από"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Ημερομηνία"
 
@@ -6209,7 +6205,7 @@ msgid "Number"
 msgstr "Αριθμός"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 #, fuzzy
 msgid "To"
 msgstr "Προς:"
@@ -6498,30 +6494,30 @@ msgstr "Βρέθηκαν %d μηνύματα.\n"
 msgid "%d messages found."
 msgstr "Βρέθηκαν %d μηνύματα.\n"
 
-#: src/query_search.c:579
-#, c-format
-msgid "Searching %s ..."
-msgstr "Αναζήτηση για %s..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Αναζήτηση για %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, c-format
+msgid "Searching %s ..."
+msgstr "Αναζήτηση για %s..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Χωρίς ημερομηνία)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Αποθήκευση Αποτελεσμάτων Αναζήτησης Ως..."
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr "Τοποθεσία: "
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 msgid "Folder name:"
 msgstr "Όνομα φακέλου:"
 
@@ -6569,7 +6565,7 @@ msgstr "\t\tγνωστός ως \"%s\"\n"
 msgid "Signature made at %s\n"
 msgstr "Υπογραφή δημιουργήθηκε στο %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Σφάλμα επιβεβαίωσης υπογραφής"
 
@@ -6597,7 +6593,7 @@ msgstr "_Σχετικά"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Αφαίρεση γραμματοκιβωτίου"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "Όχι."
 
@@ -6623,58 +6619,58 @@ msgid ""
 "%s"
 msgstr "Προέκυψε σφάλμα στη συνεδρία POP3\n"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Εμφάνιση Όλων των _Κεφαλίδων"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Λήψη αριθμού νέων μηνυμάτων (STAT)..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 #, fuzzy
 msgid "No message"
 msgstr "Δεν υπάρχουν νέα μηνύματα."
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Διαγραφή μηνύματος(ων)"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Εγκατάλειψη..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Λήψη νέων μηνυμάτων"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Αποστολή μηνύματος"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Λήψη νέων μηνυμάτων"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Λήψη μηνυμάτων από %s..."
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 #, fuzzy
 msgid "Delete messages"
 msgstr "Διαγραφή μηνύματος(ων)"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6755,67 +6751,67 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Σύνδεση στην εξυπηρέτη SMTP: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 #, fuzzy
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Προέκυψε σφάλμα κατά την αποστολή της εντολής\n"
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "Αποστολή HELO..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "Πιστοποίηση"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 msgid "Sending message..."
 msgstr "Αποστολή μηνύματος..."
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "Αποστολή EHLO..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Στέλνω MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Αποστολή"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Στέλνω RCPT TO..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Στέλνω DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Στέλνω το μήνυμα (%d / %d bytes)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr ""
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Αποστολή μηνύματος"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "Συνέβη σφάλμα κατά την αποστολή του μηνύματος."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6824,12 +6820,12 @@ msgstr ""
 "Προέκυψε ένα σφάλμα κατά την αποστολή του μηνύματος:\n"
 "%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 #, fuzzy
 msgid "Can't connect to SMTP server."
 msgstr "Δεν μπορώ να συνδεθώ στον NNTP server: %s:%d\n"
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, fuzzy, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Δεν μπορώ να συνδεθώ στον NNTP server: %s:%d\n"
@@ -6854,70 +6850,70 @@ msgstr "Αποτέλεσμα ελέγχου υπογραφής"
 msgid "Checking signature"
 msgstr "Έλεγχος υπογραφής."
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s από \"%s\""
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Δεν βρέθηκε υπογραφή"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Έγκυρη υπογραφή από τον/την \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Έγκυρη υπογραφή"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Έγκυρη υπογραφή αλλά το κλειδί για το \"%s\" δεν είναι έμπιστο"
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Έγκυρη υπογραφή (όχι έμπιστη)"
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr "Η υπογραφή είναι έγκυρη αλλά έχει λήξει για το \"%s\""
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 msgid "Signature valid but expired"
 msgstr "Η υπογραφή είναι έγκυρη αλλά έχει λήξει"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr "Η υπογραφή είναι έγκυρη αλλά το κλειδί για το \"%s\" έχει λήξει"
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr "Η υπογραφή είναι έγκυρη αλλά το κλειδί έχει λήξει"
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr "Η υπογραφή είναι έγκυρη αλλά το κλειδί για το \"%s\" έχει ανακληθεί"
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr "Η υπογραφή είναι έγκυρη αλλά το κλειδί έχει ανακληθεί"
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Εσφαλμένη υπογραφή από τον/την \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "Εσφαλμένη υπογραφή"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "Το κλειδί δεν είναι διαθέσιμο για την εξακρίβωση της υπογραφής"
 
@@ -7014,7 +7010,7 @@ msgstr "Λήψη της λίστας ομάδων νέων..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Δεν είναι δυνατή η λήψη της λίστας ομάδων συζητήσεων."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Έγινε."
 
@@ -7145,223 +7141,223 @@ msgstr "Έχουν απομείνει μερικές σημάνσεις. Να ε
 msgid "Scanning folder (%s)..."
 msgstr "Σάρωση φακέλου (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 msgid "_Search again"
 msgstr "Εύρεση _ξανά"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Δεν υπάρχουν άλλα μη αναγνωσμένα μηνύματα"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "Δεν βρέθηκαν μη αναγνωσμένα μηνύματα. Να γίνει αναζήτηση από το τέλος;"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Δεν υπάρχουν μη αναγνωσμένα μηνύματα."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να πάω στον επόμενο κατάλογο;"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Δεν υπάρχουν άλλα νέα μηνύματα"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "Δεν βρέθηκαν νέα μηνύματα. Να γίνει αναζήτηση από το τέλος;"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Δεν υπάρχουν νέα μηνύματα."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "Δεν βρέθηκαν νέα μηνύματα. Μετάβαση στον επόμενο φάκελο;"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Δεν υπάρχουν άλλα σημειωμένα μηνύματα"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "Δεν βρέθηκαν σημειωμένα μηνύματα. Να γίνει αναζήτηση από το τέλος;"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Δεν υπάρχουν σημειωμένα μηνύματα."
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 #, fuzzy
 msgid "No marked message found. Search from the beginning?"
 msgstr "Δεν βρέθηκαν σημειωμένα μηνύματα. Να γίνει αναζήτηση από την αρχή;"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Δεν υπάρχουν άλλα σημειωμένα μηνύματα"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 #, fuzzy
 msgid "No labeled message found. Search from the end?"
 msgstr "Δεν βρέθηκαν μη αναγνωσμένα μηνύματα. Να γίνει αναζήτηση από το τέλος;"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 #, fuzzy
 msgid "No labeled messages."
 msgstr "Δεν υπάρχουν άλλα σημειωμένα μηνύματα"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 #, fuzzy
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Δεν βρέθηκαν σημειωμένα μηνύματα. Να γίνει αναζήτηση από την αρχή;"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d διαγράφηκαν"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d μετακινήθηκαν"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d αντιγράφηκαν"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " επιλεγμένα αντικείμενα"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d νέα, %d αδιάβαστα, %d συνολικά (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d νέα, %d αδιάβαστα, %d συνολικά"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Περίληψη ταξινόμησης..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tΟρισμός περίληψης από τα δεδομένα του μηνύματος..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Ορισμός περίληψης από τα δεδομένα του μηνύματος..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Εγγραφή προσωρινής μνήμης περιλήψεων (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Το μήνυμα %d είναι σημειωμένο\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Το μήνυμα %d είναι σημειωμένο ως αναγνωσμένο\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Το μήνυμα %d είναι σημειωμένο ως μη αναγνωσμένο\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Το μήνυμα %s/%d είναι προς διαγραφή\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Διαγραφή μηνύματος(ων)"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Θέλετε σίγουρα να διαγράψετε τα μηνύματα από τα απορρίμματα;"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Διαγράφω τα διπλά μηνύματα..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, fuzzy, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Το μήνυμα είναι ανεπιθύμητο"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, fuzzy, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Αποτυχία ορισμού μετακίνησης ποντικιού: %d."
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "Ο προορισμός είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Επιλογή φακέλου"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, fuzzy, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Αντιγραφή επιλεγμένων μηνυμάτων στο πρόχειρο"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 msgid "Destination for copy is same as current folder."
 msgstr "Ο προορισμός αντιγραφής είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Επιλογή φακέλου"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 msgid "Error occurred while processing messages."
 msgstr "Συνέβη ένα σφάλμα κατά την επεξεργασία του μηνύματος."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Δημιουργώ τα νήματα..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr ""
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Εφαρμογή φίλτρων (%d / %d)..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "Εφαρμογή φίλτρων..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Φιλτράρω..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Φιλτραρίστηκαν %d μηνύματα."
@@ -7450,35 +7446,41 @@ msgstr "Α_ποστολή μηνυμάτων στην ουρά"
 msgid "E_xit"
 msgstr "Έ_ξοδος"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "Δεν βρέθηκε υπογραφή"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "Πληροφορίες διακομιστή"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "Τρέχει ήδη ένα Sylpheed.\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "Δεν είναι δυνατή η σημείωση του αρχείου.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "το g_thread δεν υποστηρίζεται από την glib.\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "Εισαγωγή αρχείου:"
 
diff --git a/po/es.po b/po/es.po
index 2dddfac3..0aabcf40 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: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+0900\n"
 "PO-Revision-Date: 2007-06-09 16:20+0100\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -18,226 +18,226 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Leyendo configuración de cada cuenta...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La conexión IMAP4 con %s se ha roto. Reconectando...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "El servidor IMAP4 deshabilita LOGIN.\n"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "creando conexión IMAP4 con %s:%d ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "No puedo iniciar la sesión TLS.\n"
 
-#: libsylph/imap.c:1176
-#, c-format
-msgid "Getting message %d"
+#: libsylph/imap.c:1230
+#, fuzzy, c-format
+msgid "Getting message %u"
 msgstr "Obteniendo mensaje %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Agregando mensajes a %s (%d / %d)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Moviendo mensajes %s a %s ..."
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiando mensajes %s a %s ..."
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, c-format
 msgid "Removing messages %s"
 msgstr "Borrando mensajes %s"
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "no puedo establecer los flags borrados: %s\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "no puedo vaciar\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Borrando todos los mensajes en %s"
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 msgid "can't set deleted flags: 1:*\n"
 msgstr "no puedo establecer los flags borrados: 1:*\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "no se puede cerrar la carpeta\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "la carpeta raíz %s no existe\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "hubo un error obteniendo LIST.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "No puedo crear «%s»\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "No puedo crear «%s» bajo Entrada\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no puedo crear el buzón: LIST falló\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "no puedo crear el buzón\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, 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:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "no puedo borrar el buzón\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "no se puede obtener la estructura del mensaje\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Obteniendo las cabeceras de mensaje (%d / %d)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "no se puede obtener la estructura del mensaje\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "error obteniendo la estructura del mensaje.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "No se puede interpretar la estructura del mensaje: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, 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:2714
+#: libsylph/imap.c:2863
 #, 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:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "no se puede obtener el espacio de nombres\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "no se puede seleccionar la carpeta: %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 msgid "error on imap command: STATUS\n"
 msgstr "error en el mandato imap: STATUS\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "La autentificación IMAP falló.\n"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificación IMAP4 fallida.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "no puedo añadir %s a %s\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(enviando fichero...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "no se puede añadir el mensaje a %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "no puedo copiar %s a %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "error en el mandato imap: STORE %s %s\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "error en el mandato imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "error en el mandato imap: CLOSE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv no puede convertir UTF-7 a %s\n"
 
-#: libsylph/imap.c:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv no puede convertir %s a UTF-7\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "no se puede escribir el fichero temporal\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Obteniendo mensajes desde %s en %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "no puedo leer el fichero mbox.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "formato de mbox inválido: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "mbox mal formada: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "no se puede abrir el fichero temporal\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -246,66 +246,62 @@ msgstr ""
 "Encontrado «From» sin proteger:\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "no se puede crear el fichero de bloqueo %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "usar «flock» en vez de «file» si es posible.\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "no puedo crear %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "el buzón esta siendo usado por otro proceso, esperando...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "no se puede bloquear %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "tipo de bloqueo no válido\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "no se puede desbloquear %s\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "no se puede truncar a cero el buzón.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportando mensajes de %s a %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "no se puede copiar mensaje %s a %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "No se puede abrir el fichero de marcas.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "las carpetas de origen y destino son idénticas.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copiando mensaje %s/%d a %s ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -314,7 +310,7 @@ msgstr ""
 "El fichero «%s» ya existe.\n"
 "No puedo crear la carpeta."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -333,77 +329,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "creando conexión NNTP con %s:%d ...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 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:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "el artículo %d ya esta en caché.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "obteniendo artículo %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "no puedo leer el artículo %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "no se puede enviar el artículo.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "no puedo recuperar el artículo %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "no puedo seleccionar el grupo: %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "rango de artículos no válido: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "no hay artículos nuevos.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obteniendo xover %d - %d en %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "no se puede obtener xover\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "hubo un error obteniendo xover.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "línea xover no válida: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "no se puede obtener xhdr\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "hubo un error obteniendo xhdr.\n"
 
@@ -460,27 +456,27 @@ msgstr "POP3: Borrando el mensaje caducado %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Ignorando mensaje %d (%d bytes)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "el buzón está bloqueado\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "tiempo de espera agotado para la sesión\n"
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "no puedo iniciar la sesión TLS\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "hubo algún error en la autentificación\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "mandato no soportado\n"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "hubo algún error en la sesión POP3\n"
 
@@ -511,16 +507,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:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "no se puede abrir el fichero de marcas\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "no se puede obtener el mensaje %d\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La orden para imprimir es inválida: «%s»\n"
@@ -676,7 +672,7 @@ msgstr ""
 "El orden de comprobación de mensajes será éste. Marque las casillas\n"
 "en la columna «G» para habilitar la descarga mediante «Recibir todo»."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -817,7 +813,7 @@ msgstr "Añadir dirección a la agenda"
 msgid "Address"
 msgstr "Dirección"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Notas"
@@ -826,28 +822,28 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fichero"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_Fichero/Nueva _agenda"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_Fichero/Nueva _vCard"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/_Fichero/Nuevo _JPilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fichero/Nuevo servidor _LDAP"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -855,100 +851,100 @@ msgstr "/_Fichero/Nuevo servidor _LDAP"
 msgid "/_File/---"
 msgstr "/_Fichero/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_Fichero/_Editar"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_Fichero/_Borrar"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_Fichero/_Guardar"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fichero/_Cerrar"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/_Dirección"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/_Dirección/Nueva _dirección"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/_Dirección/Nuevo _grupo"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/_Dirección/Nueva _carpeta"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/_Dirección/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/_Dirección/_Editar"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Herramientas/Importar fichero _LDIF"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Herramientas/Importar fichero _CSV"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Nueva _dirección"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Nuevo _grupo"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -961,79 +957,85 @@ msgstr "/Nueva _carpeta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 msgid "/_Copy"
 msgstr "/_Copiar"
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 msgid "/_Paste"
 msgstr "/_Pegar"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "Dirección e-mail"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Carpeta"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "Dirección e-mail"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Añadir"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Buscar"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 msgid "_Close"
 msgstr "_Cerrar"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Borrar dirección(es)"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1042,36 +1044,36 @@ msgstr ""
 "¿Quiere borrar la carpeta Y todas las direcciones en «%s»? \n"
 "Si sólo borra la carpeta las direcciones se moverán a la carpeta padre."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "_Folder only"
 msgstr "Sólo la _carpeta"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "Folder and _addresses"
 msgstr "La carpeta y las _direcciones"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente «%s»?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Nuevo usuario, no se pudo guardar el fichero índice."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Nuevo usuario, no se pudo guardar los ficheros de direcciones"
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Antigua agenda de direcciones convertida con éxito"
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1079,7 +1081,7 @@ msgstr ""
 "Antigua agenda de direcciones convertida,\n"
 "no se pudo guardar el nuevo fichero índice"
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1087,7 +1089,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "pero se crearon nuevos ficheros vacíos."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1095,7 +1097,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "no se pudieron crear los ficheros para la nueva."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1103,92 +1105,86 @@ msgstr ""
 "No se pudo convertir la antigua agenda\n"
 "y no se pudieron crear ficheros para una nueva."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 msgid "Address book conversion error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 msgid "Address book conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 msgid "Address Book Error"
 msgstr "Error en la agenda"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "No se pudo leer el índice de direcciones"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Antigua agenda de direcciones convertida, no se pudo guardar el nuevo "
 "fichero índice"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "No se pudo convertir la antigua agenda, pero se crearon nuevos ficheros "
 "vacíos."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "No se pudo convertir la antigua agenda, no se pudieron crear los ficheros "
 "para la nueva."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "No se pudo convertir la antigua agenda y no se pudieron crear ficheros para "
 "una nueva."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 msgid "Address Book Conversion Error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 msgid "Address Book Conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "Dirección de correo"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Grupo"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Carpeta"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1200,15 +1196,15 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Error"
 
@@ -1251,7 +1247,7 @@ msgstr "Marrón"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Ninguno"
 
@@ -1582,8 +1578,8 @@ msgstr "Mensaje: %s"
 msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
@@ -1776,7 +1772,7 @@ msgstr "Tipo MIME"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Tamaño"
 
@@ -2016,12 +2012,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -2169,7 +2165,7 @@ msgstr "Exportar"
 msgid "Specify source folder and destination file."
 msgstr "Especifique fichero mbox y carpeta de destino."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Formato de fecha"
@@ -2184,7 +2180,7 @@ msgstr "Directorio de origen:"
 msgid "Destination:"
 msgstr "Directorio de destino:"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2196,7 +2192,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Seleccionar..."
@@ -2256,23 +2252,23 @@ msgstr "Papelera"
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' no puede estar en el nombre de la carpeta."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La carpeta «%s» ya existe."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "No se puede crear la carpeta «%s»."
@@ -2398,31 +2394,31 @@ msgstr "Comprobar si hay mensajes nuevos en todas las carpetas..."
 msgid "Junk"
 msgstr "Basura"
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Descargando mensajes en %s ..."
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "¿Descargar todos los mensajes bajo «%s»?"
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 msgid "Download all messages"
 msgstr "Descargar todos los mensajes"
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hubo un error descargando los mensajes en «%s»."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2432,26 +2428,26 @@ msgstr ""
 "(si quiere crear una carpeta para almacenar subcarpetas,\n"
 " añada «/» al final del nombre)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nuevo nombre para «%s»:"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "No se puede renombrar la carpeta «%s»."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "No se puede mover la carpeta «%s»."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2460,11 +2456,11 @@ msgstr ""
 "¿Eliminar la carpeta de búsqueda «%s» ?\n"
 "(Los mensajes no se borrarán)"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 msgid "Delete search folder"
 msgstr "Borrar carpeta de búsqueda"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2477,20 +2473,20 @@ msgstr ""
 "\n"
 "¿Está seguro de que quiere borrarla?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No se puede borrar la carpeta «%s»."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Borrar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2499,34 +2495,34 @@ msgstr ""
 "¿Realmente desea eliminar el buzón «%s» ?\n"
 "(Los mensajes NO se borrarán del disco)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente la cuenta IMAP4 «%s»?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "Borrar cuenta IMAP4"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar el grupo de noticias «%s»?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de noticias"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar la cuenta de noticias «%s»?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Borrar cuenta de noticias"
 
@@ -2538,8 +2534,8 @@ msgstr "Grupos de noticias:"
 msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceras...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Sin remitente)"
 
@@ -2551,71 +2547,71 @@ msgstr "Creando vista de imagen...\n"
 msgid "Can't load the image."
 msgstr "No se puede cargar la imagen."
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "El fichero %s no existe."
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Especifique fichero mbox y carpeta de destino."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Buscando %s ..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Importar"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Hubo un error mientras se enviaba\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Importar"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Especifique fichero mbox y carpeta de destino."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Directorio de origen:"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Directorio de destino:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nueva carpeta"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Especifique fichero mbox y carpeta de destino."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Seleccionar fichero a importar"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Seleccionar fichero a importar"
 
@@ -2768,142 +2764,142 @@ msgstr "Importar fichero LDIF a la agenda"
 msgid "Attributes"
 msgstr "Atributos"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d mensajes nuevos"
 
-#: src/inc.c:477
+#: src/inc.c:478
 msgid "Authenticating with POP3"
 msgstr "Autentificando con POP3"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Obteniendo nuevos mensajes"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Hecho (%d mensaje(s) (%s) recibido(s))"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "No hay mensajes nuevos."
 
-#: src/inc.c:708
+#: src/inc.c:715
 #, fuzzy
 msgid "Done"
 msgstr "Hecho."
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Conexión fallida"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Authorización fallida"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:730
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Tiempo límite"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finalizado (%d mensaje(s) nuevo(s))"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Finalizado (no hay mensajes nuevos)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "Hubo algún error obteniendo el correo."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obteniendo nuevos mensajes de la cuenta %s...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Autentificando con POP3"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando nuevos mensajes"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando al servidor POP3: %s..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "No se puede conectar al servidor POP3: %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentificando..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obteniendo mensajes desde %s..."
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obteniendo el número de nuevos mensajes (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obteniendo el número de nuevos mensajes (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obteniendo el número de nuevos mensajes (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obteniendo el tamaño de nuevos mensajes (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "Borrando mensaje %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Saliendo"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaje (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2911,15 +2907,15 @@ msgstr ""
 "La ejecución de la orden del filtro de correo basura falló.\n"
 "Por favor, compruebe la configuración del filtro de correo basura."
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 msgid "Connection failed."
 msgstr "Conexión fallida."
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "Hubo un error mientras se procesaba el correo."
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2928,29 +2924,29 @@ msgstr ""
 "Hubo un error procesando el correo:\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "No hay espacio libre en disco."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "No se puede escribir el fichero."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "Error de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Conexión cerrada por la máquina remota."
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "El buzón esta bloqueado."
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2959,11 +2955,11 @@ msgstr ""
 "El buzón está bloqueado:\n"
 "%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "La autentificación falló."
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2972,15 +2968,15 @@ msgstr ""
 "La autentificación falló:\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Se agotó el tiempo de espera de la sesión."
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obteniendo nuevos mensajes desde %s en %s...\n"
@@ -2994,24 +2990,20 @@ msgstr "Contraseña para %s en %s:"
 msgid "Input password"
 msgstr "Contraseña"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Traza del protocolo"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread no está soportado por glib.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [dirección]  abre la ventana de composición"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3021,23 +3013,23 @@ msgstr ""
 "                         abre la ventana de composición con los ficheros\n"
 "                         especificados como adjuntos"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recive los mensajes nuevos"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe nuevos para todas las cuentas"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todos los mensajes en la cola"
 
-#: src/main.c:542
+#: src/main.c:554
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [carpeta]...  muestra el número total de mensajes"
 
-#: src/main.c:543
+#: src/main.c:555
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3045,47 +3037,47 @@ msgstr ""
 "  --status-full [carpeta]...\n"
 "                         muestra el estado de cada carpeta"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open idcarpeta/nºmsj abre el mensaje en una ventana nueva"
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir nombredir  indicar el directorio con ficheros de configuración"
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 "  --ipcport numpuerto    especificar el puerto IPC para órdenes remotas"
 
-#: src/main.c:550
+#: src/main.c:562
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 finalizar Sylpheed"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuración"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 presenta esta ayuda y finaliza"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              da la información de la versión y finaliza"
 
-#: src/main.c:557
+#: src/main.c:569
 #, c-format
 msgid "Press any key..."
 msgstr "Pulse cualquier tecla..."
 
-#: src/main.c:638
+#: src/main.c:694
 msgid "Filename encoding"
 msgstr "Codificación de los nombres de fichero"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3109,19 +3101,19 @@ msgstr ""
 "\n"
 "¿Desea continuar?"
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "Está componiendo un mensaje. ¿Seguro que quiere salir?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Mensajes en cola"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hay mensajes sin enviar en la cola. ¿Salir ahora?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3129,16 +3121,20 @@ msgstr ""
 "GnuPG no esta convenientemente instalado, o es una versión antigua.\n"
 "Soporte para OpenPGP deshabilitado."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "ya hay otro Sylpheed en ejecución.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 msgid "Migration of configuration"
 msgstr "Migración de la configuración"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3784,8 +3780,8 @@ msgstr "Creando ventana principal...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando color %d\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "hecho.\n"
 
@@ -4044,7 +4040,7 @@ msgstr "Adjuntos"
 msgid "Message View - Sylpheed"
 msgstr "Vista de mensaje - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "No puedo guardar el fichero «%s»."
@@ -6101,19 +6097,19 @@ msgstr "Adjunto"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Desde"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Fecha"
 
@@ -6123,7 +6119,7 @@ msgid "Number"
 msgstr "Número"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 msgid "To"
 msgstr "Para"
 
@@ -6410,29 +6406,29 @@ msgstr "1 mensaje encontrado."
 msgid "%d messages found."
 msgstr "%d mensajes encontrados."
 
-#: src/query_search.c:579
-#, c-format
-msgid "Searching %s ..."
-msgstr "Buscando %s ..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Buscando %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, c-format
+msgid "Searching %s ..."
+msgstr "Buscando %s ..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Sin fecha)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 msgid "Save as search folder"
 msgstr "Guardar como carpeta de búsqueda"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr "Ubicación:"
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 msgid "Folder name:"
 msgstr "Nombre de carpeta:"
 
@@ -6478,7 +6474,7 @@ msgstr "\t\talias «%s»\n"
 msgid "Signature made at %s\n"
 msgstr "Firma hecha en %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Error al verificar la firma"
 
@@ -6507,7 +6503,7 @@ msgstr "Acerca de"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "No."
 
@@ -6533,58 +6529,58 @@ msgid ""
 "%s"
 msgstr "hubo algún error en la sesión POP3\n"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Obteniendo las cabeceras de mensaje (%d / %d)"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Obteniendo el número de nuevos mensajes (STAT)..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 #, fuzzy
 msgid "No message"
 msgstr "No hay mensajes nuevos."
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Borrar mensaje(s)"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Terminando..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Obteniendo nuevos mensajes"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Enviar mensaje"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Obteniendo nuevos mensajes"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Obteniendo mensajes desde %s..."
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 #, fuzzy
 msgid "Delete messages"
 msgstr "Borrar mensaje(s)"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6665,66 +6661,66 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Conectando con el servidor SMTP: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Hubo un error des pues del mandato QUIT (se ignora)"
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "Autentificando"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 msgid "Sending message..."
 msgstr "Enviando mensaje..."
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Enviando"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Enviando DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando mensaje (%d / %d bytes)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr ""
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "Hubo un error enviando el mensaje."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6733,11 +6729,11 @@ msgstr ""
 "Hubo un error enviando el mensaje:\n"
 "%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 msgid "Can't connect to SMTP server."
 msgstr "No se puede conectar con el servidor SMTP."
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "No se puede conectar con el servidor SMTP: %s:%d"
@@ -6762,70 +6758,70 @@ msgstr "Resultado de comprobación de la firma"
 msgid "Checking signature"
 msgstr "Verificando firma"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s desde «%s»"
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "No se encontró firma"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma válida de «%s»"
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Firma válida"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Firma válida pero la clave para «%s» no es fiable"
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Firma válida (clave no fiable)"
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr "Firma válida pero caducada para «%s»"
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 msgid "Signature valid but expired"
 msgstr "Firma válida pero caducada"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr "La firma es válida pero la clave usada para «%s» ha caducado"
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr "La firma es válida pero la clave usada ha caducado"
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr "La firma es válida pero la clave usada para «%s» ha sido revocada"
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr "La firma es válida pero la clave usada ha sido revocada"
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma INVÁLIDA de «%s»"
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "Firma INVÁLIDA"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "No hay clave pública para verificar la firma"
 
@@ -6928,7 +6924,7 @@ msgstr "Obteniendo la lista de grupos..."
 msgid "Can't retrieve newsgroup list."
 msgstr "No se puede obtener la lista de grupos."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Hecho."
 
@@ -7055,219 +7051,219 @@ msgstr "Queda alguna marca. ¿Procesarla?"
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 msgid "_Search again"
 msgstr "_Buscar de nuevo"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "No hay más mensajes sin leer"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "No hay mensajes sin leer. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "No hay mensajes sin leer."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "No hay mensajes sin leer. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "No hay más mensajes nuevos"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "No hay más mensajes nuevos. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "No hay mensajes nuevos."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "No hay más mensajes nuevos. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "No hay más mensajes marcados"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "No hay mensajes marcados."
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el principio?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "No hay más mensajes etiquetados"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "No hay mensajes etiquetados."
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el principio?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensajes por asunto..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " elemento(s) seleccionados"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuevos, %d no leídos, %d totales (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nuevos, %d no leídos, %d totales"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Ordenando cabeceras..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tExtrayendo cabeceras de los mensajes..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Resumiendo los mensajes..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Escribiendo caché resumen (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaje %d está marcado\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaje %d marcado como leído\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaje %d marcado como no leído\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaje %s/%d marcado para borrar\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Borrar mensaje(s)"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "¿Quiere realmente borrar el/los mensaje(s) de la papelera?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaje %s/%d desmarcado\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaje %d marcado para mover a %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Seleccionar carpeta"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaje %d marcado para copiar a %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 msgid "Destination for copy is same as current folder."
 msgstr "El destino de la copia es el mismo que la carpeta actual."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Seleccionar carpeta"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 msgid "Error occurred while processing messages."
 msgstr "Hubo algún error al procesar los mensajes."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Construyendo hilos..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Deshaciendo hilos..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando (%d / %d)..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "se ha(n) filtrado %d mensaje(s)."
@@ -7357,35 +7353,41 @@ msgstr "_Enviar mensajes en la cola"
 msgid "E_xit"
 msgstr "_Salir"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "No se encontró firma"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "Información del servidor"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "ya hay otro Sylpheed en ejecución.\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "No se puede abrir el fichero de marcas.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "g_thread no está soportado por glib.\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "Importando fichero:"
 
diff --git a/po/et.po b/po/et.po
index 3e6a23b2..768edd1a 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: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+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,233 +18,233 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Loen kõigi kontode seaded...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 ühendus %s:%d-ga katkes. Taasühendan...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP serveri kataloog"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "loon IMAP4 ühendust %s:%d-ga ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "Ei suuda avada TLS sessiooni.\n"
 
-#: libsylph/imap.c:1176
+#: libsylph/imap.c:1230
 #, fuzzy, c-format
-msgid "Getting message %d"
+msgid "Getting message %u"
 msgstr "Kustutan kirja %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Saadan kirja (%d / %d baiti)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Liigutan kirja %s%c%d kausta %s ...\n"
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopeerin kirja %s%c%d kausta %s ...\n"
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ei suutnud seada kustutatu lippu: %d\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "ei suuda väljastada\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ei suutnud seada kustutatu lippu: 1:%d\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ei suuuda valida kausta: %s\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "*Märgi faili ei leidunud.\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "Nimistu saamisel tekkis viga.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Ei suuda luua '%s'\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Ei suuda luua '%s' Sisendkasti all\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ei suuda luua kirjakasti: Nimistu ebaõnnestus\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "ei suuda luua kirjakasti\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, 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:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "ei suuda kustutada kirjakasti\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "ei suuda võtta ümbrikut\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Saadan kirja (%d / %d baiti)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "ei suuda võtta ümbrikut\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "ümbriku võtmisel tekis viga.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ei suutnud avada ümbrikut: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ei suuda ühendada IMAP4 serveriga: %s:%d\n"
 
-#: libsylph/imap.c:2714
+#: libsylph/imap.c:2863
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ei suuda ühendada IMAP4 serveriga: %s:%d\n"
 
-#: libsylph/imap.c:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "ei suutnud leida nime asukohta\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ei suuuda valida kausta: %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autoriseerimise meetod"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 sissekirjutus ebaõnnestus.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ei suuda %s-d lisada %s-i\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(saadan faili...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ei suuda lisada kirja %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ei suuda %d-d kopeerida %s-i\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, 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:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, 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:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ei suuda konverteerida %s-i UTF-7-ks\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "ei suuda kirjutada ajutisse faili\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "Ei saa lugeda kirjakasti faili.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "sobimatu kirjakasti formaat: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "paha mbox: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "ei saa avada ajutist fili\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -253,66 +253,62 @@ msgstr ""
 "Vabanematuid (kellelt) leitud:\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "ei saa luua lukufaili %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "kasuta 'flock'-i 'file' asemel kui võimalik.\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "ei suuda luua %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "kirjakasti kasutab teine protsess, ootan...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "ei suuda lukustada %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "vale luku tüüp\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "ei saa lukku eemaldada %s-lt\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "kirjakasti ei saa lõigata nulliks.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Ekspordime teated %s-ist %s-i ...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ei saa kirja kopeerida %s-st %s-i\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "Ei suutnud avada märgi faili.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "lähtekaust on identne sihtkaustale.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopeerin kirja %s%c%d kausta %s ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -321,7 +317,7 @@ msgstr ""
 "Fail %s on juba olemas.\n"
 "Ei saa kausta luua."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -333,77 +329,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "loon NNTP ühendust %s:%d-ga ...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 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:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "artikkel %d on juba hoidlas.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "võtan artikli %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "ei saanud artiklit %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "ei saanud saata artiklit.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "ei saanud artiklit %d kohale\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "ei saa valida gruppi %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ebasobiv artiklite vahemik: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "uusi artikelid pole.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "*võtan xover-i %d - %d %s-is\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "*ei saa xover'it\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "*xover'i võtmisel tekkis viga\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "*vigane xover rida: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "*ei saa xhdr-i\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "xhdr-i võtmise käigus tekkis viga.\n"
 
@@ -462,28 +458,28 @@ msgstr "POP3: Kustutan aegunud kirja %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Jätan kirja (%d / %d baiti) vahele\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "kirjakast on lukus\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr ""
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "ei suutnud käivitada TLS sessiooni\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "autoriseerimisel tekkis viga\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 #, fuzzy
 msgid "command not supported\n"
 msgstr "Käsklus"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "autoriseerimisel tekkis viga\n"
@@ -517,16 +513,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:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "Ei suuda avada märgifaili\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ei suuda võtta kirja %d\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Trükkimise käsurida on vale: %s\n"
@@ -681,7 +677,7 @@ msgstr ""
 "*Uusi teateid võetakse selles järjekorras. Märgi kastikesed\n"
 "'G' tulbas lubamaks kirjade võtmist kasutades 'Võta kõik'."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -822,7 +818,7 @@ msgstr "Lisa aadress raamatusse"
 msgid "Address"
 msgstr "Aadress"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Märkused"
@@ -831,29 +827,29 @@ msgstr "Märkused"
 msgid "Select Address Book Folder"
 msgstr "Vali aadressiraamatu kaust"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fail"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_Fail/Uus raamat"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_Fail/Uus _V-Kaart"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/_Fail/Uus _JPiloot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fail/Uus _Server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -861,101 +857,101 @@ msgstr "/_Fail/Uus _Server"
 msgid "/_File/---"
 msgstr "/_Fail/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_Fail/R_edigeeri"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_Fail/Kustuta"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_Fail/_Salvesta"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fail/Sul_ge"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/R_edaktor"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/R_edaktor/_Aseta"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/_Aadress"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/_Aadress/Uus _Aadress"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/_Aadress/Uus _Grupp"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/_Aadress/Uus Kaust"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/_Aadress/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/_Aadress/R_edigeeri"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/_Aadress/Kustuta"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Tööriist"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Abi/Sellest"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Uus _Aadress"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Uus _Grupp"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Uus Kaust"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -968,82 +964,88 @@ msgstr "/Uus Kaust"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/Kustuta"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 #, fuzzy
 msgid "/_Copy"
 msgstr "/Kopeeri..."
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 #, fuzzy
 msgid "/_Paste"
 msgstr "/R_edaktor/_Aseta"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "E-Posti aadress"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Aadressiraamat"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Kaust"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "E-Posti aadress"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nimi:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Kellele:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Koopia:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Pimekoopia:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Kustuta"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Lisa"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Otsi"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 #, fuzzy
 msgid "_Close"
 msgstr "Sulge"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Kustuta aadress(id)"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Kas te tõesti soovite aadresse kustutada?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1052,38 +1054,38 @@ msgstr ""
 "Kas te soovite kustutada kataloogi `%s' JA kõik aadressid ?\n"
 "Kui kustutate ainult kataloogi, siis aadressid kantakse pealmisse kausta."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 #, fuzzy
 msgid "_Folder only"
 msgstr "Ainult kataloog"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Kaust ja aadressid"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Kas tõesti kustutada `%s' ?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Uus kasutaja, ei saanud salvestada indeksifaili."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Uus kasutaja, ei saanud salvestada aadressiraamatu faile."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Vana aadressiraamat uuendati edukalt."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1091,7 +1093,7 @@ msgstr ""
 "Vana aadressiraamat uuendati.\n"
 "ei saanud salvestada uut aadresside indeksifaili"
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1099,7 +1101,7 @@ msgstr ""
 "Ei saanud uuendada aadressiraamatut,\n"
 "kuid loodi uued ja tühjad aadressiraamatu failid."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1107,7 +1109,7 @@ msgstr ""
 "Ei suutnud uuendada aadressiraamatut,\n"
 "ei suutnud luua uusi aadressiraamatu faile."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1115,96 +1117,90 @@ msgstr ""
 "Ei suutnud uuendada aadressiraamatut,\n"
 "ja ei suutnud luua uut aadressiraamatu faile."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Aadressiraamat viiakse uude formaati"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Aadressiraamatu viga"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Ei suutnud lugeda aadresside indeksit"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Uuendati vana aadressiraamat, kuid ei suudetud salvestada uut indeksifaili"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Ei suutnud uuendada aadressiraamatut, kuid loodi tühjad ja uued "
 "aadressiraamatu failid."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Ei suutnud uuendada aadressiraamatut, ei suutnud luua uusi aadressiraamatu "
 "faile."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Ei suutnud uuendada aadressiraamatut ja ei suutnud luua uusi aadressiraamatu "
 "faile."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Aadressiraamatu uuendamine"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Kasutajaliides"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "EPosti Aadress"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Grupp"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Kaust"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "V-Kaart"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPiloot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1216,15 +1212,15 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Märkus"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Viga"
 
@@ -1267,7 +1263,7 @@ msgstr "Pruun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Mittemiski"
 
@@ -1640,8 +1636,8 @@ msgstr "Kiri: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Pole pealkirja)"
 
@@ -1833,7 +1829,7 @@ msgstr "MIME tüüp"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Suurus"
 
@@ -2082,12 +2078,12 @@ msgstr "Redigeeri kausta"
 msgid "Input the new name of folder:"
 msgstr "Sisesta uus nimi või kaust:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Uus kaust"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Sisesta uue kausta nimi:"
 
@@ -2233,7 +2229,7 @@ msgstr "Väljasta"
 msgid "Specify source folder and destination file."
 msgstr "*Märgi võtav mbox fail ja sihtkaust."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Kuupäeva formaat"
@@ -2248,7 +2244,7 @@ msgstr "Lähte kataloog"
 msgid "Destination:"
 msgstr "Sihtkaust"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2260,7 +2256,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Vali... "
@@ -2322,23 +2318,23 @@ msgstr "Prügikast"
 msgid "Drafts"
 msgstr "Mustandid"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "Uus Kaust"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Sümbol `%c' ei saa olla lisatud kausta nimele."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Kaust %s on juba olemas."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ei suuda luua kausta %s."
@@ -2473,32 +2469,32 @@ msgstr "Kõigis kaustades otsitakse uusi kirju..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Valitud on kaust %s\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Saadan kirja"
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Saadan kirja"
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 #, fuzzy
 msgid "Download all messages"
 msgstr "Saadan kirja"
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2508,26 +2504,26 @@ msgstr ""
 "(kui soovite luua kausta, millesse saaks teisi kaustu lisada,\n"
 " siis lisage / nime lõppu)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Sisesta uus nimi %s-le:"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Nimeta kaust ümber"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2536,12 +2532,12 @@ msgstr ""
 "Kas tõepoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Kustuta kaust"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2552,21 +2548,21 @@ msgstr ""
 "Kustutatakse kõik kaustad ja kirjad %s-s.\n"
 "Kas sa tõesti soovid kustutada?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Tühjenda prügikast"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2575,34 +2571,34 @@ msgstr ""
 "Kas tõepoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "Eemalda kirjakst"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Kas tõesti kustutada IMAP4 konto %s?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "Kustuta IMAP4 konto"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Kas tõesti soovite kustutada uudistegruppi %s?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Kustuta uudistegrupp"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Kas tõesti kustutda uudistegrupp %s ?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Kustuta uudistegrupp"
 
@@ -2614,8 +2610,8 @@ msgstr "Uudistegrupid:"
 msgid "Creating header view...\n"
 msgstr "Loon päise vaadet...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Eikelleltki)"
 
@@ -2627,71 +2623,71 @@ msgstr "Loon pildi vaadet...\n"
 msgid "Can't load the image."
 msgstr "Ei suuda lugeda pilti."
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Faili %s ei leidu\n"
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "*Märgi võtav mbox fail ja sihtkaust."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Tuhnin kaustas %s ..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Impordi"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Tuhnin kaustas %s ..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Kirja saatmisel tekkis viga\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Impordi"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "*Märgi võtav mbox fail ja sihtkaust."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Lähte kataloog"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Sihtkataloog:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Uus kaust"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "*Märgi võtav mbox fail ja sihtkaust."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Märgi importiv fail"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Märgi importiv fail"
 
@@ -2852,216 +2848,216 @@ msgstr "Impordi LDIF fail aadressiraamatusse"
 msgid "Attributes"
 msgstr "Atribuudid"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Lõpetatud (%d uut kirja)"
 
-#: src/inc.c:477
+#: src/inc.c:478
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autoriseerimine"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Võtan uusi kirju"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "*Juures"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Katkestatud"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Tirin"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Valmis (%d kirja (%s)-st võetud)"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Uusi kirju ei ole."
 
-#: src/inc.c:708
+#: src/inc.c:715
 msgid "Done"
 msgstr "Tehtud"
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Ühendus ebaõnnestus"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Autoriseerimine ebaõnnestus"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Lukustatud"
 
-#: src/inc.c:730
+#: src/inc.c:737
 #, fuzzy
 msgid "Timeout"
 msgstr "Ajalimiit (sek)"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Lõpetatud (%d uut kirja)"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Lõpetatud (uusi kirju pole)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "Tekksiid mõned vead kirjade võtmisel."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "võtan uued kirjad kontolt %s...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autoriseerimine"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Uute kirjade võtmine"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Ühendan POP3 serveriga: %s ..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ei suuda ühenduda POP3 serveriga %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Autoriseerin..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Võtan uute kirjade arvu (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Võtan kirjade suuruse (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "Kustutan kirja %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Väljun"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Võtan kirja (%d /%d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 #, fuzzy
 msgid "Connection failed."
 msgstr "Ühendus ebaõnnestus"
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Ketas täis."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 #, fuzzy
 msgid "Can't write file."
 msgstr "Ei saa kirjutada faili.\n"
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 #, fuzzy
 msgid "Socket error."
 msgstr "Soketi viga\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "Sissekanne peatatud\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Võtame uued teated %s-ist %s-i.\n"
@@ -3075,24 +3071,20 @@ msgstr "Sisesta parool %s-i jaoks %s-s:"
 msgid "Input password"
 msgstr "Sisesta parool"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Protokolli sündmustik"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread ei ole glib poolt toetatud.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Kauta: %s [SEADED]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [aadress]    ava kirjakirjutamise aken"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3102,73 +3094,73 @@ msgstr ""
 "                          ava uue kirja aken nii, et märgitud failid\n"
 "                          on manustatud kirjale"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              võta uued kirjad"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          võta uued kirjad kõigilt konto"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --saada              saada kõik järjekorras olevad kirjad"
 
-#: src/main.c:542
+#: src/main.c:554
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --staatus              näita kogu kirjade arvu"
 
-#: src/main.c:543
+#: src/main.c:555
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --staatus              näita kogu kirjade arvu"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:550
+#: src/main.c:562
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                veaotsimise režiim"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                veaotsimise režiim"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 näita seda teadet ja välju"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              näita versiooni informatsiooni ja välju"
 
-#: src/main.c:557
+#: src/main.c:569
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "või vajuta 'y' klahvi.\n"
 "\n"
 
-#: src/main.c:638
+#: src/main.c:694
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Väljuva kirja kooditabel"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3182,19 +3174,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "Kirjakirjutamine on pooleli. Tõesti lõpetame?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "kirjad järjekorras"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Mõned saatmata kirjad on järjekooras. Lõpetame?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3202,17 +3194,21 @@ msgstr ""
 "GnuPG pole installeeritud, või on liialt vana.\n"
 "OpenPGP toetus keelustatud."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "üks teine Sylpheed juba töötab.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Tegevuste konfiguratsiooni kirjutamine...\n"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3901,8 +3897,8 @@ msgstr "Loon peamise akna...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "PeaAken: värvi haldamine %d ebaõnnestus\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "tehtud.\n"
 
@@ -4144,7 +4140,7 @@ msgstr "Manused"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ei suuda faili '%s' salvestada."
@@ -6294,19 +6290,19 @@ msgstr "Manus"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Pealkiri"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Kellelt"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Kuupäev"
 
@@ -6316,7 +6312,7 @@ msgid "Number"
 msgstr "Number"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 #, fuzzy
 msgid "To"
 msgstr "Kellele:"
@@ -6618,31 +6614,31 @@ msgstr "leiti %d kirju.\n"
 msgid "%d messages found."
 msgstr "leiti %d kirju.\n"
 
-#: src/query_search.c:579
-#, fuzzy, c-format
-msgid "Searching %s ..."
-msgstr "Tuhnin kaustas %s ..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtreerin..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, fuzzy, c-format
+msgid "Searching %s ..."
+msgstr "Tuhnin kaustas %s ..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Kuupäeva pole)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Kataloogist otsimine"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 #, fuzzy
 msgid "Location:"
 msgstr "Tsiteerimine"
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 #, fuzzy
 msgid "Folder name:"
 msgstr "Failinimi"
@@ -6693,7 +6689,7 @@ msgstr ""
 msgid "Signature made at %s\n"
 msgstr "Allkiri %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Viga allkirja kontrollimisel"
 
@@ -6722,7 +6718,7 @@ msgstr "Sellest"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Eemalda kirjakst"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "Ei."
 
@@ -6748,58 +6744,58 @@ msgid ""
 "%s"
 msgstr "autoriseerimisel tekkis viga\n"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Saadan kirja (%d / %d baiti)"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 #, fuzzy
 msgid "No message"
 msgstr "Uusi kirju ei ole."
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Kustuta kirjad"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Väljun..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Võtan uusi kirju"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Saada kiri"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Võtan uusi kirju"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 #, fuzzy
 msgid "Delete messages"
 msgstr "Kustuta kirjad"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6876,81 +6872,81 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Ühendun SMTP serveriga: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 #, fuzzy
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, fuzzy, c-format
 msgid "Sending HELO..."
 msgstr "Saadan KIRJA...."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 #, fuzzy
 msgid "Authenticating"
 msgstr "Autoriseerimine"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 #, fuzzy
 msgid "Sending message..."
 msgstr "Saadan kirja"
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, fuzzy, c-format
 msgid "Sending EHLO..."
 msgstr "Saadan KIRJA...."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Saadan KIRJA...."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Saadan"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Saadan RCPT..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Saadan andmed..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Saadan kirja (%d / %d baiti)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr ""
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Saadan kirja"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "Kirja saatmisel tekkis viga."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
 "%s"
 msgstr "Kirja saatmisel tekkis viga."
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 #, fuzzy
 msgid "Can't connect to SMTP server."
 msgstr "Ei saa ühendust SMTP serveriga: %s:%d\n"
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, fuzzy, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Ei saa ühendust SMTP serveriga: %s:%d\n"
@@ -6977,71 +6973,71 @@ msgstr "Näita allkirja kontrolli tulemusi ajutises aknas"
 msgid "Checking signature"
 msgstr "Allkirja kontroll"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s \"%s\"-lt"
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Allkirja ei leidunud"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "\"%s\"-lt on hea allkiri"
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Hea allkiri"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr ""
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 #, fuzzy
 msgid "Signature valid but expired"
 msgstr "Allkiri %s\n"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr ""
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr ""
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr ""
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr ""
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Halb allkiri \"%s\"-lt"
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "HALB allkiri"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "Pole avalikku võtit allkirja kontrollimiseks"
 
@@ -7140,7 +7136,7 @@ msgstr "Ei saanud uudistegrupi nimistut."
 msgid "Can't retrieve newsgroup list."
 msgstr "Ei saanud uudistegrupi nimistut."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Tehtud."
 
@@ -7271,222 +7267,222 @@ msgstr "Mõned märgid on jäänud. Protsessime selle?"
 msgid "Scanning folder (%s)..."
 msgstr "Tuhnin kaustas (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 #, fuzzy
 msgid "_Search again"
 msgstr "Otsi uuesti"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Pole rohkem kirju, mida pole loetud."
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "Pole rohkem kirju, mida pole loetud. Otsime alates lõpust?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Kirju mida pole loetud ei ole."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "Ei leidunud kirju mida pole loetud. Otsime järgmisest kaustast?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Pole rohkem kirju"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "Pole rohkem uusi kirju. Otsime alates lõpust?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Uusi kirju ei ole."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "Uusi kirju ei leidu. Otsime järgmisest kaustast?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Pole Rohkem märgitud kirju"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "Märgitud kirju ei leidunud. Kas otsime lõpust?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Märgitud kirju ei ole."
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "Märgitud kirju ei leidunud. Kas otsime algusest?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Rohkem sildiga kirju ei ole"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "Rohkem sildiga kirju ei leitud. Kas otsime lõpust?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Rohkem sildiga kirju ei ole."
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Rohkem seildiga kirju ei leitud. Kas otsime algusest?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "*Võtan kirju päälkirja järgi..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d on kustutatud"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d on ülekantud"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d on kopeeritud"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " kirja märgitud"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "uusi %d, mitteloetuid %d, kokku %d (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "uusi %d, mitteloetuid %d, kokku %d"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Sorteerin kirjaloendi..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\t sätin kokkuvõtte kirja andmetest..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Teen kokkuvõtte teadete andmetest..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "*Kirjutan koondy puvrisse (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Kiri %d on märgitud\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Kiri %d on märgitud kui läbiloetu\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Kiri %d on märgitud kui mitteloetu\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Kiri %s/%d on määratud kustutamisele\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Kustuta kirjad"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Kas te tõesti soovite kirju eemaldada prügikastist?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Kustutan duplitseeritud kirju..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Kiri %s/%d pole märgitud\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Kiri %d on määratud ülekandmiseks %s-i\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "Sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Vali kaust"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Kiri %d on määratud kopeerimisele %s-i\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Kopeerimise sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Vali kaust"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Loon teemad..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Eemaldan teemad..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "filtreerin..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "kiri %d on juba salvestatud.\n"
@@ -7582,36 +7578,42 @@ msgstr "Saada kirjad järjekorrast"
 msgid "E_xit"
 msgstr "Välju"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Vana Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "Allkirja ei leidunud"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "Serveri informatsioon"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "üks teine Sylpheed juba töötab.\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "Ei suutnud avada märgi faili.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "g_thread ei ole glib poolt toetatud.\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "Faili importimine:"
 
diff --git a/po/fr.po b/po/fr.po
index 2a0bcc76..b5fd3368 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+0900\n"
 "PO-Revision-Date: 2008-12-04 00:06+0100\n"
 "Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -28,226 +28,226 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Lecture de la configuration des comptes...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connexion IMAP4 vers %s a été interrompue. Reconnexion...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Le serveur IMAP4 désactive LOGIN.\n"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "création de la connexion IMAP4 vers %s:%d ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "Impossible d'initier la session TLS.\n"
 
-#: libsylph/imap.c:1176
-#, c-format
-msgid "Getting message %d"
+#: libsylph/imap.c:1230
+#, fuzzy, c-format
+msgid "Getting message %u"
 msgstr "Réception du message %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Ajout des messages à %s (%d / %d)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Déplacement des messages de %s vers %s ..."
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copie des messages de %s vers %s ..."
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, c-format
 msgid "Removing messages %s"
 msgstr "Effacement des messages %s"
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "impossible de marquer pour la suppression : %s\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "impossible de purger\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Effacement de tous les messages dans %s"
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 msgid "can't set deleted flags: 1:*\n"
 msgstr "impossible de marquer pour la suppression : 1:*\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "impossible de fermer le dossier\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "le dossier racine %s n'existe pas\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "Une erreur est survenue lors de la réception de LIST.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Impossible de créer « %s »\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Impossible de créer « %s » sous Réception \n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Impossible de créer la boîte aux lettres : LIST échoué.\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "impossible de créer la boîte aux lettres\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, 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:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "impossible de supprimer la boîte aux lettres\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "Impossible de faire une enveloppe\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Réception des en-têtes de message (%d / %d)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "Impossible de faire une enveloppe\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "erreur lors de la lecture de l'enveloppe.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "impossible d'analyser l'enveloppe : %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, 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:2714
+#: libsylph/imap.c:2863
 #, 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:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "Impossible d'obtenir l'espace nom\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Impossible de sélectionner le dossier : %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 msgid "error on imap command: STATUS\n"
 msgstr "erreur avec la commande IMAP : STATUS\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "L'authentification IMAP4 a échoué.\n"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "Échec au login IMAP4.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "Impossible de d'ajouter %s à %s\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(envoi du fichier...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "impossible d'ajouter le message à %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "impossible de copier %s vers %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erreur avec la commande IMAP : STORE %s %s\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erreur lors de la commande IMAP : EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "erreur avec la commande IMAP : CLOSE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, 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:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne peut convertir de %s vers UTF-7\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "Impossible d'écrire dans le fichier temporaire\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Réception des messages de %s dans %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "Impossible de lire le fichier mbox.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "Format mbox invalide : %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "mbox mal formée : %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "Impossible d'ouvrir un fichier temporaire\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -256,66 +256,62 @@ msgstr ""
 "From 'unescaped' trouvé :\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "Impossible de créer le fichier verrou %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "Utilisation de 'flock' à la place de 'file' si possible\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "Impossible de créer %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "mailbox utilisée par un autre processus, attente...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "Impossible de verrouiller %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "Type de verrou invalide\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "Impossible de déverrouiller %s\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "Impossible de vider la boîte aux lettres.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportation des messages de %s vers %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "Impossible de copier le message de %s à %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "Impossible d'ouvrir le fichier des marques.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "dossier source identique à la destination.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copie du message %s/%d vers %s ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -324,7 +320,7 @@ msgstr ""
 "Le fichier « %s » existe déjà.\n"
 "Impossible de créer le dossier."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -345,77 +341,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "Création de la connexion NNTP vers %s:%d ...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 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:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "L'article %d a déjà été mis en cache.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "Récupération de l'article %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "Impossible de lire l'article %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "Impossible de poster l'article.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "Impossible de récupérer l'article %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "impossible de sélectionner le groupe : %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "Intervalle d'articles invalide : %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "Pas de nouvel article.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "Exécution de xover %d - %d sur %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "Impossible de faire un xover\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "Une erreur a eu lieu pendant la lecture du xover.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "Ligne xover invalide : %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "Impossible d'obtenir xhdr\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "Erreur lors de la réception de xhdr.\n"
 
@@ -472,28 +468,28 @@ msgstr "POP3 : Suppression du message expiré %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3 : Message ignoré %d (%d octets)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "La boîte aux lettres est verrouillée\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "dépassement du délai de réponse (timeout) de la session\n"
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "échec lors de l'ouverture de la session TLS\n"
 
 #
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "une erreur est survenue pendant la phase d'authentification\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "commande non supportée\n"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "une erreur est survenue pendant la session POP3\n"
 
@@ -524,16 +520,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:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "Impossible d'ouvrir le fichier des marques\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "impossible de récupérer le message %d\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La ligne de commande d'impression est invalide : « %s »\n"
@@ -690,7 +686,7 @@ msgstr ""
 "case dans la colonne G pour relever le courrier du compte \n"
 "correspondant lorsque « Tout relever » est activé"
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -831,7 +827,7 @@ msgstr "Ajouter l'adresse au carnet"
 msgid "Address"
 msgstr "Adresses"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Remarques"
@@ -840,28 +836,28 @@ msgstr "Remarques"
 msgid "Select Address Book Folder"
 msgstr "Choisissez un dossier"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fichier"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_Fichier/Nouveau _carnet d'adresses"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_Fichier/Nouveau carnet _vCard"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/_Fichier/Nouveau carnet _JPilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fichier/Nouveau _serveur LDAP"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -869,100 +865,100 @@ msgstr "/_Fichier/Nouveau _serveur LDAP"
 msgid "/_File/---"
 msgstr "/_Fichier/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_Fichier/Édit_er"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_Fichier/_Supprimer"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_Fichier/En_registrer"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fichier/_Fermer"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/É_dition"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/É_dition/_Copier"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/É_dition/Co_ller"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Nouvelle _adresse"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Nouveau _groupe"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Nouveau _dossier"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/Édit_er"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Supprimer"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Outils"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Outils/Importer un fichier _LDIF"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Outils/Importer un fichier _CSV"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_ide"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_ide/À _propos"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Nouvelle _adresse"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Nouveau _groupe"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -975,79 +971,85 @@ msgstr "/Nouveau _dossier"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Supprimer"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 msgid "/_Copy"
 msgstr "/_Copier"
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 msgid "/_Paste"
 msgstr "/Co_ller"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "Adresse électronique"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Dossier"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "Adresse électronique"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nom :"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "À :"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Copie :"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Copie discrète :"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Rechercher"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 msgid "_Close"
 msgstr "_Quitter"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Suppression d'adresse(s)"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Voulez-vous supprimer la(les) adresse(s) sélectionnée(s) ?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1057,37 +1059,37 @@ msgstr ""
 "Si vous supprimez uniquement le dossier, les adresses seront déplacées dans "
 "le dossier parent."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "_Folder only"
 msgstr "_Dossier uniquement"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "Folder and _addresses"
 msgstr "Dossier et _adresses"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Voulez-vous vraiment supprimer « %s » ?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Nouvel utilisateur. Impossible d'enregistrer le fichier index."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr ""
 "Nouvel utilisateur, impossible d'enregistrer le fichier carnet d'adresses."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Ancien carnet d'adresses converti avec succès."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1095,7 +1097,7 @@ msgstr ""
 "Ancien carnet d'adresses converti,\n"
 "mais impossible d'enregistrer le nouveau fichier index."
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1103,7 +1105,7 @@ msgstr ""
 "Échec lors de la conversion de l'ancien carnet d'adresses.\n"
 "Création d'un nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1111,7 +1113,7 @@ msgstr ""
 "Échec lors de la conversion du carnet d'adresses.\n"
 "Impossible de créer un nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1119,92 +1121,86 @@ msgstr ""
 "Échec lors de la conversion du carnet d'adresses\n"
 "et lors de la création d'un nouveau carnet d'adresses."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 msgid "Address book conversion error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 msgid "Address book conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 msgid "Address Book Error"
 msgstr "Erreur dans le carnet d'adresses"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Échec lors de la lecture de l'index des adresses"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Ancien carnet d'adresses converti, mais échec lors de l'écriture du fichier "
 "index"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Échec lors de la conversion du carnet d'adresses. Création d'un nouveau "
 "carnet d'adresses vide."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Échec lors de la conversion du carnet d'adresses et lors de la création d'un "
 "nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Échec lors de la conversion du carnet d'adresses et lors de la création d'un "
 "nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 msgid "Address Book Conversion Error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 msgid "Address Book Conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Personne"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Groupe"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Dossier"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "Serveur LDAP"
 
@@ -1216,15 +1212,15 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Information"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Avertissement"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Erreur"
 
@@ -1267,7 +1263,7 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Aucun"
 
@@ -1600,8 +1596,8 @@ msgstr "Message : %s"
 msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
@@ -1792,7 +1788,7 @@ msgstr "Type MIME"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Taille"
 
@@ -2036,12 +2032,12 @@ msgstr "Édition du dossier"
 msgid "Input the new name of folder:"
 msgstr "Saisissez le nouveau nom du dossier :"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Saisissez le nom du nouveau dossier :"
 
@@ -2188,7 +2184,7 @@ msgid "Specify source folder and destination file."
 msgstr ""
 "Veuillez indiquer le fichier mbox à importer et le dossier destinataire"
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Format de la date"
@@ -2203,7 +2199,7 @@ msgstr "Dossier à exporter :"
 msgid "Destination:"
 msgstr "Dossier destinataire :"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2215,7 +2211,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Choisir... "
@@ -2276,23 +2272,23 @@ msgstr "Corbeille"
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "NouveauDossier"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "« %c » n'est pas valide dans le nom du dossier."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Le dossier « %s » existe déjà."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossible de créer le dossier « %s »."
@@ -2418,32 +2414,32 @@ msgstr "Recherche des nouveaux messages..."
 msgid "Junk"
 msgstr "Indésirable"
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Dossier %s sélectionné\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Téléchargement des messages dans %s ..."
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Téléchargement de tous les messages dans '%s' ?"
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 msgid "Download all messages"
 msgstr "Téléchargement de tous les messages"
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr ""
 "Une erreur est survenue lors du téléchargement des messages dans « %s »."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2453,26 +2449,26 @@ msgstr ""
 "(si vous voulez créer un dossier pouvant contenir d'autres dossiers,\n"
 " ajouter `/' à la fin du nom)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Saisissez le nouveau nom pour « %s » :"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Changement de nom de dossier"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Impossible de renommer le dossier « %s »."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossible de déplacer le dossier « %s »."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2481,11 +2477,11 @@ msgstr ""
 "Effacer le dossier de tri « %s » ?\n"
 "Les messages existants ne seront PAS effacés du disque."
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 msgid "Delete search folder"
 msgstr "Effacer le dossier de tri"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2498,20 +2494,20 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment les effacer ?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossible d'effacer le dossier « %s »."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 msgid "Delete all messages in the trash folder?"
 msgstr "Effacer tous les messages dans la corbeille ?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2520,34 +2516,34 @@ msgstr ""
 "Ne plus utiliser la boîte aux lettres « %s » (les\n"
 "messages existants ne seront PAS effacés du disque) ?"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "Suppression d'une boîte aux lettres"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Confirmez-vous la suppression du compte IMAP4 « %s » ?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "Suppression du compte IMAP4"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Confirmer la suppression du groupe de discussion « %s » ?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Suppression du groupe de discussion"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Confirmer la suppression du compte « %s » des groupes de discussion ?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Suppression du compte des groupes de discussion"
 
@@ -2559,8 +2555,8 @@ msgstr "Groupe de discussion :"
 msgid "Creating header view...\n"
 msgstr "Création de la vue des en-têtes...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Pas d'expéditeur)"
 
@@ -2572,74 +2568,74 @@ msgstr "Création de la vue de l'image...\n"
 msgid "Can't load the image."
 msgstr "Impossible de charger l'image."
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Le fichier %s n'existe pas."
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr ""
 "Veuillez indiquer le fichier mbox à importer et le dossier destinataire"
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Recherche %s ..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Importer"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Analyse du dossier %s ..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Erreur lors de l'envoi.\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Importer"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr ""
 "Veuillez indiquer le fichier mbox à importer et le dossier destinataire"
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Dossier à exporter :"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Dossier destinataire :"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nouveau dossier"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr ""
 "Veuillez indiquer le fichier mbox à importer et le dossier destinataire"
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Choix du fichier à importer"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Choix du fichier à importer"
 
@@ -2794,141 +2790,141 @@ msgstr "Importation d'un fichier LDIF dans un carnet d'adresses"
 msgid "Attributes"
 msgstr "Attributs"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed : %d nouveau(x) message(s)"
 
-#: src/inc.c:477
+#: src/inc.c:478
 msgid "Authenticating with POP3"
 msgstr "Authentification POP3"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Récupération des nouveaux messages"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "Attente"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Annulé"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Récupération"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, c-format
 msgid "%d message(s) (%s) received"
 msgstr "%d message(s) (%s) reçu(s)"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, c-format
 msgid "no new messages"
 msgstr "pas de nouveau message"
 
-#: src/inc.c:708
+#: src/inc.c:715
 msgid "Done"
 msgstr "Terminé"
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "La connexion a échoué"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "L'authentification a échoué"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Verrouillé"
 
-#: src/inc.c:730
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Délai d'attente"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Terminé - %d nouveau(x) message(s)"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Terminé - pas de nouveau(x) message(s)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "Erreur lors de la récupération des messages."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "Récupération des nouveaux messages du compte %s ...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s : Authentification POP3"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Récupération des nouveaux messages"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Connexion au serveur POP3 : %s..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur POP3 : %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Authentification..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Réception des messages de %s..."
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Récupération du nombre de nouveaux messages (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Récupération du nombre de nouveaux messages (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Récupération du nombre de nouveaux messages (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Récupération de la taille des messages (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "Suppression du message %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Fermeture"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Récupération du message (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2936,15 +2932,15 @@ msgstr ""
 "Erreur dans la gestion des messages indésirables.\n"
 "Vérifier les paramètres."
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 msgid "Connection failed."
 msgstr "La connexion a échoué."
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "Une erreur est survenue pendant le traitement du message."
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2953,29 +2949,29 @@ msgstr ""
 "Une erreur est survenue pendant le traitement du message :\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Plus de place disponible sur le disque."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "Impossible d'écrire dans le fichier."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "Erreur de protocole."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "La connexion a été fermée par le serveur."
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "Boîte verrouillée."
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2984,11 +2980,11 @@ msgstr ""
 "Boîte verrouillée :\n"
 "%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "L'authentification à échoué."
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2997,15 +2993,15 @@ msgstr ""
 "L'authentification a échoué :\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Dépassement du délai de réponse (timeout) de la session."
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "Relève du courrier annulée\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Récupération des nouveaux messages de %s dans %s...\n"
@@ -3019,24 +3015,20 @@ msgstr "Saisissez le mot de passe de %s pour %s :"
 msgid "Input password"
 msgstr "Saisissez le mot de passe"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Journal de connexion"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread non supporté par glib.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilisation : %s [OPTION]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    ouvrir une fenêtre de composition de message"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3047,24 +3039,24 @@ msgstr ""
 "(s)\n"
 "                         jointe(s) le(s) fichier(s) spécifié(s)"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              récupérer les nouveaux messages"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all          récupérer les nouveaux messages de tous les comptes"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envoyer les messages en attente"
 
-#: src/main.c:542
+#: src/main.c:554
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [dossier]...  afficher le nombre total de messages"
 
-#: src/main.c:543
+#: src/main.c:555
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3072,50 +3064,50 @@ msgstr ""
 "  --status-full [dossier]...\n"
 "                         afficher l'état de chaque dossier"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 "  --open [id dossier]/[numéro du message] ouvrir le message dans une "
 "nouvelle fenêtre"
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir dossier    indiquer le dossier contenant les fichiers de "
 "configuration"
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 "··--ipcport·portnum······spécifier le port pour les commandes IPC distantes"
 
-#: src/main.c:550
+#: src/main.c:562
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 quitter Sylpheed"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                afficher les informations de mise au point"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 afficher l'aide-mémoire"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              afficher les informations de version"
 
-#: src/main.c:557
+#: src/main.c:569
 #, c-format
 msgid "Press any key..."
 msgstr "Appuyez sur une touche..."
 
-#: src/main.c:638
+#: src/main.c:694
 msgid "Filename encoding"
 msgstr "Jeu de caractères du nom de fichier"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3139,23 +3131,23 @@ msgstr ""
 "\n"
 "Poursuivre ?"
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr ""
 "Une fenêtre de composition de message existe.\n"
 "Voulez-vous vraiment quitter ?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Messages en file d'attente"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Quelques messages non envoyés sont dans la file d'attente. Quitter "
 "maintenant ?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3163,16 +3155,20 @@ msgstr ""
 "GnuPG n'est pas installé correctement.\n"
 "Support OpenPGP désactivé."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "une autre session de Sylpheed existe.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 msgid "Migration of configuration"
 msgstr "Migration de la configuration"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3821,8 +3817,8 @@ msgstr "Création de la fenêtre principale...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fenêtre principale : allocation de la couleur %d échouée\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "terminé.\n"
 
@@ -4080,7 +4076,7 @@ msgstr "Pièces jointes"
 msgid "Message View - Sylpheed"
 msgstr "Fenêtre des messages - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossible d'enregistrer le fichier « %s »."
@@ -6154,19 +6150,19 @@ msgstr "Pièces jointes"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Sujet"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Expéditeur"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Date"
 
@@ -6176,7 +6172,7 @@ msgid "Number"
 msgstr "Numéro"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 msgid "To"
 msgstr "À"
 
@@ -6462,29 +6458,29 @@ msgstr "1 message trouvé"
 msgid "%d messages found."
 msgstr "%d messages trouvés"
 
-#: src/query_search.c:579
-#, c-format
-msgid "Searching %s ..."
-msgstr "Recherche %s ..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Recherche %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, c-format
+msgid "Searching %s ..."
+msgstr "Recherche %s ..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(aucune date)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 msgid "Save as search folder"
 msgstr "Enregistrer en tant que dossier de tri"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr "Emplacement :"
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 msgid "Folder name:"
 msgstr "Nom du dossier :"
 
@@ -6530,7 +6526,7 @@ msgstr "\t\tdit \"%s\"\n"
 msgid "Signature made at %s\n"
 msgstr "Date de la signature : %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Erreur lors de la vérification de la signature"
 
@@ -6555,7 +6551,7 @@ msgstr "À _propos"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - boîte POP3 à distance"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "N°"
 
@@ -6582,55 +6578,55 @@ msgstr ""
 "Une erreur est survenue pendant la session POP3 :\n"
 "%s"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Réception des en-têtes de message (%d / %d) ..."
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 msgid "Getting the number of messages..."
 msgstr "Récupération du nombre de messages..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 msgid "No message"
 msgstr "Pas de message"
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, c-format
 msgid "Deleted %d messages"
 msgstr "Suppression de %d message(s)"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Fermeture..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, c-format
 msgid "Retrieved %d messages"
 msgstr "Récupération de %d messages"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, c-format
 msgid "Opened message %d"
 msgstr "Message ouverte %d"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, c-format
 msgid "Retrieved %d message headers"
 msgstr "Récupération de %d en-têtes de message"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, c-format
 msgid "Retrieving message %d ..."
 msgstr "Réception de messages %d ..."
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 msgid "Delete messages"
 msgstr "Suppression des messages"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6713,66 +6709,66 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Connection au serveur SMTP : %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Une erreur (ignorée) est survenue après la commade 'Quit'"
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "Envoi de HELO..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "Authentification"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 msgid "Sending message..."
 msgstr "Envoi du message..."
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "Envoi de EHLO..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Envoi de MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Envoi"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Envoi de RCPT TO..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Envoi de DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Envoi du message (%d / %d octets)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr "%d / %d bytes"
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Envoi de message"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "Une erreur est survenue pendant l'envoi de message."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6781,11 +6777,11 @@ msgstr ""
 "Une erreur est survenue pendant l'envoi du message :\n"
 "%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 msgid "Can't connect to SMTP server."
 msgstr "Impossible de se connecter au serveur SMTP "
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Impossible de se connecter au serveur SMTP : %s:%d"
@@ -6810,72 +6806,72 @@ msgstr "Résultat de la vérification de signature"
 msgid "Checking signature"
 msgstr "/_Vérification de la signature"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s de \"%s\""
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Pas de signature trouvée"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signature correcte de \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Signature correcte"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Signature correcte mais la clé pour \"%s\" n'est pas de confiance"
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Signature correcte (clé suspecte)"
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr "La signature est correcte mais a expiré pour  \"%s\""
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 msgid "Signature valid but expired"
 msgstr "La signature est correcte mais a expiré"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr ""
 "La signature est correcte mais la clé de signature pour \"%s\" a expiré"
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr "La signature est correcte mais la clé de signature a expiré"
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr ""
 "La signature est correcte mais la clé de signature pour \"%s\" a été révoquée"
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr "La signature est correcte mais la clé de signature a été révoquée"
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Mauvaise signature de \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "MAUVAISE signature"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "Pas de clé publique pour vérifier la signature"
 
@@ -6979,7 +6975,7 @@ msgstr "Récupération de la liste des groupes de discussion..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Impossible d'obtenir la liste des groupes de discussion."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Terminé."
 
@@ -7106,219 +7102,219 @@ msgstr "Il reste des messages marqués, voulez-vous les traiter ?"
 msgid "Scanning folder (%s)..."
 msgstr "Analyse du dossier (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 msgid "_Search again"
 msgstr "_Chercher encore"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "Plus de message non lu. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "Pas de message non lu. Passer au dossier suivant ?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Plus de nouveaux messages"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "Plus de nouveaux messages. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Pas de nouveaux messages."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "Plus de nouveaux messages. Aller au dossier suivant ?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Plus de messages marqués"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "Plus de messages marqués. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Pas de message marqué."
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "Plus de messages marqués. Rechercher depuis le début ?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Plus de messages marqués"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "Plus de messages marqués. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Plus de messages marqués."
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Plus de messages marqués. Rechercher depuis le début ?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Tri des messages par sujet..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d effacé"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d déplacé"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copié"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " élément(s) sélectionné(s)"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nouveau(x), %d non lu(s), %d au total (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nouveau(x), %d non lu(s), %d au total"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Tri de l'index..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tDéfinition de l'index à partir des données du message..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Définition de l'index à partir des données du message..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Écriture du cache index (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Le message %d est marqué\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Le message %d est marqué comme lu\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Le message %d est marqué comme non lu\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Le message %s/%d sera effacé\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Suppression de message(s)"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr ""
 "Voulez-vous vraiment supprimer définitivement ce(s) message(s) de la "
 "corbeille ?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Suppression des messages en double..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Le message %s/%d est démarqué\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Le message %d est marqué pour déplacement dans %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "La destination est identique au dossier actuel."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 msgid "Select folder to move"
 msgstr "Choisir le dossier à déplacer"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Le message %d est à copier vers %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 msgid "Destination for copy is same as current folder."
 msgstr "La destination et la source de la copie sont identiques."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 msgid "Select folder to copy"
 msgstr "Choisir le dossier à copier"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 msgid "Error occurred while processing messages."
 msgstr "Une erreur est survenue pendant le traitement des messages."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Construction des threads..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Suppression des threads..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrage (%d / %d)..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "tri en cours..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Tri en cours..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d message(s) ont été filtré(s)."
@@ -7408,35 +7404,41 @@ msgstr "_Envoyer les messages en attente"
 msgid "E_xit"
 msgstr "_Quitter"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "Pas de signature trouvée"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "Configuration des serveurs"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "une autre session de Sylpheed existe.\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "Impossible d'ouvrir le fichier des marques.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "g_thread non supporté par glib.\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "Fichier mbox :"
 
diff --git a/po/gl.po b/po/gl.po
index 7f691b69..4859aaef 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: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -18,232 +18,232 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Lendo configuración de cada conta...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Perdeuse a conexión IMAP4 con %s:%d . Reconectando...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Directorio do servidor IMAP4"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "creando conexión IMAP4 con %s:%d ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "Non podo iniciar a sesión TLS.\n"
 
-#: libsylph/imap.c:1176
+#: libsylph/imap.c:1230
 #, fuzzy, c-format
-msgid "Getting message %d"
+msgid "Getting message %u"
 msgstr "Borrando mensaxe %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Enviando mensaxe (%d / %d bytes)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Movendo mensaxe %s%c%d a %s ...\n"
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiando mensaxe %s%c%d a %s ...\n"
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "non podo establecer os indicadores borrados: %d\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "non podo baleirar\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "non podo establecer os indicadores borrados: 1:%d\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "non se pode seleccionar a carpeta: %s\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Ficheiro de marcas non atopado.\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "ocurriu un erro obtendo LIST.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Non podo crear '%s'\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Non podo crear '%s' bajo Entrada\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "non podo crear a: LIST falló\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "non podo crear a caixa de correo\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, 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:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "non podo borrar a caixa de correo\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "non se pode obter a estructura da mensaxe\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Enviando mensaxe (%d / %d bytes)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "non se pode obter a estructura da mensaxe\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "Erro obtendo a estructura da mensaxe.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "Non se pode interpretar a estructura da mensaxe: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, 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:2714
+#: libsylph/imap.c:2863
 #, 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:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "no se pode obter o espacio de nomes\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "non se pode seleccionar a carpeta: %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Fallo de autenticación"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificación IMAP4 fallida.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "non podo engadir %s a %s\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(enviando ficheiro...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "non se pode engadir o mensaxe %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "non podo copiar %d a %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, 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:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv non pode convertir UTF-7 a %s\n"
 
-#: libsylph/imap.c:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non pode convertir %s a UTF-7\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "non se pode escribir o ficheiro temporal\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "non podo ler o ficheiro mbox.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "formato de mbox inválido: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "mbox malformada: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "non se pode abrir o ficheiro temporal\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -252,66 +252,62 @@ msgstr ""
 "Atopado Dende sin escapar:\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "non se pode crear o ficheiro de bloqueo %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "usar 'flock' en vez de 'file' si é posible.\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "non podo crear %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "a caixa de correo esta sendo usada por outro proceso, esperando...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "non se pode bloquear %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "tipo de bloqueo non válido\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "non se pode desbloquear %s\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "non se pode truncar a cero a caixa de correo.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportando mensaxes de %s a %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "non se pode copiar mensaxe %s a %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "Non se pode abrir o ficheiro de marcas.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "carpetas de orixen e destiño idénticas.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copiando mensaxe %s%c%d a %s ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -320,7 +316,7 @@ msgstr ""
 "o Ficheiro `%s' xa existe.\n"
 "Non podo crear a carpeta."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -332,77 +328,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "creando conexión NNTP con %s:%d ...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 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:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "o artigo %d xa esta en caché.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "obtendo artigo %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "no podo leer o artículo %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "no se pode enviar o artículo.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "no podo obter o artículo %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "non podo seleccionar grupo %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "rango de artículos no válido: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "no hai artículos novos.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obteniendo xover %d - %d en %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "no se pode obtener xover\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "ocurriu un erro obtendo xover.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "linea xover non válida: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "non se pode obter xhdr\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "ocurriu un erro obtendo xhdr.\n"
 
@@ -461,27 +457,27 @@ msgstr "POP3: Borrando mensaxe expirado %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Ignorando mensaxe %d (%d bytes)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "a caixa de correo está bloqueado\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr ""
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "non podo abrir a sesión TLs\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "ocurriu algún erro na autenticación\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "Comando non soportado\n"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "ocurriu algún erro na sesión POP3\n"
 
@@ -514,16 +510,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:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "no se pode abrir o ficheiro de marcas\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "non se pode obter o mensaxe %d\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "o comando de impresión non é válido: `%s'\n"
@@ -679,7 +675,7 @@ msgstr ""
 "A orde de comprobación de mensaxes será este. Marque as casilas\n"
 "na columna `G' para activar a descarga mediante `Traer todo'."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -820,7 +816,7 @@ msgstr "Engadir enderezo á axenda"
 msgid "Address"
 msgstr "Enderezo"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Notas"
@@ -829,29 +825,29 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta da axenda"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Ficheiro"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_Ficheiro/Nova _axenda"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_Ficheiro/Nova _vCard"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/_Ficheiro/Novo _JPilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Ficheiro/Novo _servidor"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -859,101 +855,101 @@ msgstr "/_Ficheiro/Novo _servidor"
 msgid "/_File/---"
 msgstr "/_Ficheiro/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_Ficheiro/_Editar"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_Ficheiro/_Borrar"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Ficheiro/_Pechar"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/_Enderezo"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/_Enderezo/Novo _enderezo"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "//_Enderezo/Novo _grupo"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/_Enderezo/Nova _carpeta"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/_Enderezo/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/_Enderezo/_Editar"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/_Enderezo/_Borrar"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Novo _enderezo"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Novo _grupo"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Nova _carpeta"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -966,82 +962,88 @@ msgstr "/Nova _carpeta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Copiar..."
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "Enderezo e-mail"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Axenda de enderezos"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Carpeta"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "Enderezo e-mail"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Engadir"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Buscar"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 #, fuzzy
 msgid "_Close"
 msgstr "Pechar"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Borrar enderezo(s)"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente o(s) enderezo(s)?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1050,38 +1052,38 @@ msgstr ""
 "¿Quere borrar a carpeta E todos os enderezos en `%s'? \n"
 "Si so borra a carpeta os enderezos se moverán á carpeta pai."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 #, fuzzy
 msgid "_Folder only"
 msgstr "Carpeta só"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Carpeta e enderezos"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente `%s' ?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Novo usuario, non se puido gardar o ficheiro índice."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Novo usuario, non se puido gardar os ficheiros de enderezos"
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Antiga axenda de enderezos convertida con éxito"
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1089,7 +1091,7 @@ msgstr ""
 "Antiga axenda de enderezos convertida,\n"
 "non se puido gardar o novo ficheiro índice"
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1097,7 +1099,7 @@ msgstr ""
 "Non se puido convertir a antiga axenda,\n"
 "pero crearonse novos ficheiros valeiros."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1105,7 +1107,7 @@ msgstr ""
 "Non se puido convertir a antiga axenda,\n"
 "Non se puideron crear os ficheiros para a nova."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1113,97 +1115,91 @@ msgstr ""
 "Non se puido convertir a antiga axenda\n"
 "e non se puideron crear ficheiros para unha nova."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Conversión da  axenda"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Error na axenda"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Non se puido ler o índice de enderezos"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Antiga axenda de enderezos convertida, non se puido gardar o novo ficheiro "
 "índice"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Non se puido convertir a antiga axenda, pero se crearon novos ficheiros "
 "valeiros."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Non se puido convertir a antiga axenda, non se puideron crear os ficheiros "
 "para a nova."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Non se puido convertir a antiga axenda e non se puideron crear ficheiros "
 "para unha nova."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Erro na conversión da axenda"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Conversión da axenda"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Persoa"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Grupo"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Carpeta"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1215,15 +1211,15 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Erro"
 
@@ -1266,7 +1262,7 @@ msgstr "Marrón"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Ningún"
 
@@ -1639,8 +1635,8 @@ msgstr "Mensaxe: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Non se pode obter a parte do mensaxe multipartes."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
@@ -1832,7 +1828,7 @@ msgstr "Tipo MIME"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Tamaño"
 
@@ -2080,12 +2076,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nome da nova carpeta:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Nova carpeta"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Nome da nova carpeta:"
 
@@ -2232,7 +2228,7 @@ msgstr "Exportar"
 msgid "Specify source folder and destination file."
 msgstr "Especifique ficheiro mbox e carpeta de destiño."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Formato de data"
@@ -2247,7 +2243,7 @@ msgstr "Carpeta orixen:"
 msgid "Destination:"
 msgstr "Destiño"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2259,7 +2255,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "Seleccionar..."
@@ -2321,23 +2317,23 @@ msgstr "Papeleira"
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "NovaCarpeta"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' non pode estar no nome da carpeta."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "a carpeta `%s' xa existe."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Non se pode crear a carpeta `%s'."
@@ -2469,32 +2465,32 @@ msgstr "Comprobar si hai mensaxes novos en todas as carpetas..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Enviando mensaxe"
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Enviando mensaxe"
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 #, fuzzy
 msgid "Download all messages"
 msgstr "Enviando mensaxe"
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2504,26 +2500,26 @@ msgstr ""
 "(si quere crear unha carpeta para almacenar subcarpetas,\n"
 " engada `/' o final do nome)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Renomear carpeta"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2532,12 +2528,12 @@ msgstr ""
 "¿Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrarán do disco)"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Borrar carpeta"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2548,21 +2544,21 @@ msgstr ""
 "Todas as carpetas e mensaxes baixo `%s' serán borrados.\n"
 "¿Confirma o borrado?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Baleirar papeleira"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2571,34 +2567,34 @@ msgstr ""
 "¿Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrarán do disco)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente a conta IMAP4 `%s'?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "Borrar conta IMAP4"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar o grupo de novas `%s'?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de novas"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar a conta de novas `%s'?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Borrar conta de novas"
 
@@ -2610,8 +2606,8 @@ msgstr "Grupos de novas:"
 msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceiras...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Sin remite)"
 
@@ -2623,71 +2619,71 @@ msgstr "Creando vista de imaxen...\n"
 msgid "Can't load the image."
 msgstr "Non se pode cargar a imaxen."
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "o ficheiro %s non existe\n"
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Especifique ficheiro mbox e carpeta de destiño."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Importar"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Ocurríu un erro mentras se enviaba\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Importar"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Especifique ficheiro mbox e carpeta de destiño."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Carpeta orixen:"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Carpeta de destiño:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nova carpeta"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Especifique ficheiro mbox e carpeta de destiño."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Seleccionar ficheiro a importar"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Seleccionar ficheiro a importar"
 
@@ -2848,159 +2844,159 @@ msgstr "Importar ficheiro LDIF na axenda"
 msgid "Attributes"
 msgstr "Atributos"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Finalizado (%d mensaxe(s) novo(s))"
 
-#: src/inc.c:477
+#: src/inc.c:478
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autenticando"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Obtendo novos mensaxes"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Feito (%d mensaxe(s) (%s) recibido(s))"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Non hai mensaxes novas."
 
-#: src/inc.c:708
+#: src/inc.c:715
 #, fuzzy
 msgid "Done"
 msgstr "Feito."
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Conexión fallida"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Autorización fallida"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:730
+#: src/inc.c:737
 #, fuzzy
 msgid "Timeout"
 msgstr "Tiempo límite (seg.)"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finalizado (%d mensaxe(s) novo(s))"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Finalizado (non hai mensaxes novos)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "Ocurriu algún erro obtendo o correo."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obtendo novas mensaxes da conta %s...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autenticando"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando novas mensaxes"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando ó servidor POP3: %s ..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Non se pode conectar ó servirdor POP3: %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtendo o número de novas mensaxes (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtendo o número de novas mensaxes (STAT)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtendo o número de novas mensaxes (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o tamaño de novas mensaxes (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "Borrando mensaxe %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Saíndo"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaxe (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 #, fuzzy
 msgid "Connection failed."
 msgstr "Conexión fallida"
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "Ocurriu un erro mentras se procesaba o correo."
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3009,29 +3005,29 @@ msgstr ""
 "Ocurriu un erro mentras se procesaba o correo:\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Non hai espacio libre no disco."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "Non se pode escribir o ficheiro."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "Error de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "a caixa de correo esta bloqueada."
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3040,12 +3036,12 @@ msgstr ""
 "a caixa de correo esta bloqueada:\n"
 "%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Fallo de autenticación"
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3054,15 +3050,15 @@ msgstr ""
 "Fallo de autenticación:\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obtendo novos mensaxes dende %s en %s...\n"
@@ -3076,24 +3072,20 @@ msgstr "Contrasinal para %s en %s:"
 msgid "Input password"
 msgstr "Contrasinal"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Rexistro do protocolo"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread non está soportado por glib.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [dirección]  abre a fiestra de edición"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3103,73 +3095,73 @@ msgstr ""
 "                         abre a fiestra de composición con os ficheiros\n"
 "                         especificados como adxuntos"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recibe as mensaxes novas"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe novas mensaxes para todas as contas"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todas as mensaxes na cola"
 
-#: src/main.c:542
+#: src/main.c:554
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               mostra o número total de mensaxes"
 
-#: src/main.c:543
+#: src/main.c:555
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               mostra o número total de mensaxes"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:550
+#: src/main.c:562
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                modo de depuración"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuración"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 presenta esta axuda e finaliza"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              da a información da versión e finaliza"
 
-#: src/main.c:557
+#: src/main.c:569
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "ou pulse a tecla `y'.\n"
 "\n"
 
-#: src/main.c:638
+#: src/main.c:694
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Codificación para enviar"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3183,19 +3175,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "Está compoñendo unha mensaxe. ¿Quere sair?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Mensaxes en cola"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hai mensaxes sin enviar na cola. ¿Sair agora?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3203,17 +3195,21 @@ msgstr ""
 "GnuPG non esta convenientemente instalado, ou é unha versión antiga.\n"
 "Soporte para OpenPGP deshabilitado."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "xa hai outro Sylpheed executándose.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "configuración das accions"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3901,8 +3897,8 @@ msgstr "Creando Fiestra principal...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando cor %d\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "feito.\n"
 
@@ -4146,7 +4142,7 @@ msgstr "Adxuntos"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Non podo gardar o ficheiro `%s'."
@@ -6293,19 +6289,19 @@ msgstr "Adxunto"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Dende"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Data"
 
@@ -6315,7 +6311,7 @@ msgid "Number"
 msgstr "Número"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 #, fuzzy
 msgid "To"
 msgstr "Para:"
@@ -6617,30 +6613,30 @@ msgstr "%d mensaxes atopados.\n"
 msgid "%d messages found."
 msgstr "%d mensaxes atopados.\n"
 
-#: src/query_search.c:579
-#, fuzzy, c-format
-msgid "Searching %s ..."
-msgstr "Revisando carpeta %s ..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, fuzzy, c-format
+msgid "Searching %s ..."
+msgstr "Revisando carpeta %s ..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Sin data)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Gardar como borrador"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 #, fuzzy
 msgid "Folder name:"
 msgstr "Nome de ficheiro"
@@ -6691,7 +6687,7 @@ msgstr ""
 msgid "Signature made at %s\n"
 msgstr "Sinatura feita en %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Error ó verificar a sinatura"
 
@@ -6720,7 +6716,7 @@ msgstr "Acerca de"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "Non."
 
@@ -6746,58 +6742,58 @@ msgid ""
 "%s"
 msgstr "ocurriu algún erro na sesión POP3\n"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Enviando mensaxe (%d / %d bytes)"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Obtendo o número de novas mensaxes (STAT)..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 #, fuzzy
 msgid "No message"
 msgstr "Non hai mensaxes novas."
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Borrar mensaxe(s)"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Terminando..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Obtendo novos mensaxes"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Enviar Mensaxe"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Obtendo novos mensaxes"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 #, fuzzy
 msgid "Delete messages"
 msgstr "Borrar mensaxe(s)"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6874,68 +6870,68 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Conectando con o servidor SMTP: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 #, fuzzy
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Ocurriu un erro mentras se enviaba o correo."
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 #, fuzzy
 msgid "Sending message..."
 msgstr "Enviando mensaxe"
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Enviando"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Enviando DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando mensaxe (%d / %d bytes)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr ""
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Enviando mensaxe"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "Ocurriu un erro enviando as mensaxes."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6944,12 +6940,12 @@ msgstr ""
 "Ocurriu un erro enviando a mensaxe:\n"
 ".%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 #, fuzzy
 msgid "Can't connect to SMTP server."
 msgstr "Non se pode conectar con o servidor SMTP: %s:%d\n"
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, fuzzy, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Non se pode conectar con o servidor SMTP: %s:%d\n"
@@ -6977,71 +6973,71 @@ msgstr "Mostrar diálogo de comprobación de sinatura"
 msgid "Checking signature"
 msgstr "Verificando sinatura"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s dende \"%s\""
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Non se atopou sinatura"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Sinatura válida de \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Sinatura válida"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr ""
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 #, fuzzy
 msgid "Signature valid but expired"
 msgstr "Sinatura feita en %s\n"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr ""
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr ""
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr ""
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr ""
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Sinatura INVÁLIDA de \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "Sinatura INVÁLIDA"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "Non hai clave pública para verificar a sinatura"
 
@@ -7140,7 +7136,7 @@ msgstr "Non se pode obter a lista de grupos."
 msgid "Can't retrieve newsgroup list."
 msgstr "Non se pode obter a lista de grupos."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Feito."
 
@@ -7271,222 +7267,222 @@ msgstr "Queda algunha marca. ¿Procesa-la?"
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 #, fuzzy
 msgid "_Search again"
 msgstr "Búscar de novo"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Non hai mais mensaxes sin ler"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "Non hai mensaxes sin ler. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Non hai mensaxes sin leer."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "Non hai mensaxes sen ler. ¿Ir á carpeta seguinte?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Non hai mais mensaxes novas"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "Non hai mais mensaxes novas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Non hai mensaxes novas."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "Non hai máis mensaxes novas. ¿Ir a a carpeta seguinte?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Non hai mais mensaxes marcadas"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "Non hai mensaxes marcadas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Non hai mensaxes marcadas."
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "Non hai mensaxes marcadas. ¿Buscar dende o principio?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Non hai mais mensaxes etiquetadas"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "Non hai mensaxes etiquetadas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Non hai mensaxes etiquetadas."
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Non hai mensaxes etiquetadas. ¿Buscar dende o principio?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensaxes por asunto..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " elemento(s) seleccionados"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novas, %d non leídos, %d totales (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novas, %d non leídos, %d totales"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Ordeando cabeceiras..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tExtraindo cabeceiras das mensaxes..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Resumindo as mensaxes..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Escribindo caché resumo (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaxe %d está marcado\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaxe %d marcada como leído\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaxe %d marcada como non leído\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaxe %s/%d marcada para borrar\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Borrar mensaxe(s)"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "¿Quere realmente borrar a/as mensaxe(s) da papeleira?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensaxes duplicadas..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaxe %s/%d desmarcada\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaxe %d marcada para mover a %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "o destino e o mismo que a carpeta actual."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Seleccionar carpeta"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaxe %d marcada para copiar a %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "o destino de copia é a carpeta actual."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Seleccionar carpeta"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Ocurriu un erro mentras se procesaba o correo."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Construindo xerarquía..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Desfacendo xerarquía..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "o mensaxe %d xa esta en caché.\n"
@@ -7582,36 +7578,42 @@ msgstr "Enviar mensaxe(s) na cola"
 msgid "E_xit"
 msgstr "Sair"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Antigos de Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "Non se atopou sinatura"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "Información do servidor"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "xa hai outro Sylpheed executándose.\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "Non se pode abrir o ficheiro de marcas.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "g_thread non está soportado por glib.\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "Ficheiro a importar:"
 
diff --git a/po/hr.po b/po/hr.po
index e9a780b6..54b7b475 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: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+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,234 +18,234 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Čitam konfiguracije za svaki račun...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 veza prema %s:%d je pukla. Povezujem se ponovo...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Direktorij IMAP poslužitelja"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "ostvarujem IMAP4 vezu prema %s:%d ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr ""
 
-#: libsylph/imap.c:1176
+#: libsylph/imap.c:1230
 #, fuzzy, c-format
-msgid "Getting message %d"
+msgid "Getting message %u"
 msgstr "Brišem poruke"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Šaljem poruku (%d / %d bytea)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Premještam poruke %s%c%d u %s ...\n"
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ne mogu postaviti obrisane oznake: %d\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "ne mogu obrisati\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ne mogu postaviti obrisane oznake: 1:%d\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Označena datoteka ne postoji.\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "došlo je do greške prilikom dobivanja LISTe.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, fuzzy, c-format
 msgid "Can't create '%s'\n"
 msgstr "ne mogu kreirati %s\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, fuzzy, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "ne mogu kreirati %s\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ne mogu kreirati sandučić: LIST nije uspio\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "ne mogu kreirati sandučić\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, fuzzy, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ne mogu kreirati sandučić\n"
 
-#: libsylph/imap.c:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "ne mogu obrisati sandučić\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "ne mogu dobiti omot\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Šaljem poruku (%d / %d bytea)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "ne mogu dobiti omot\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "došlo je do greške prilikom dobivanja omota.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ne mogu analizirati omot: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, 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:2714
+#: libsylph/imap.c:2863
 #, 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:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "ne mogu dobiti namespace\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autorizacija"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login propao.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne mogu pričvrstiti %s na %s\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 #, fuzzy
 msgid "(sending file...)"
 msgstr "Šaljem DATA..."
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne mogu obilježiti poruku %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne mogu kopirati %d u %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, 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:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr ""
 
-#: libsylph/imap.c:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "ne mogu pisati u privremenu datoteku\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "ne mogu čitati mbox datoteku.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "pogrešan mbox format: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "pokvaren mbox: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "ne mogu otvoriti privremenu datoteku\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -254,66 +254,62 @@ msgstr ""
 "neizbježan Od pronađen:\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "ne mogu kreirati lock datoteku %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "koristi 'flock' umjesto 'file' ako je moguće.\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "ne mogu kreirati %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "neki drugi proces koristi sandučić, čekam...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "ne mogu zaključati %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "neispravan tip zaključavanja\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "ne mogu otključati %s\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "ne mogu skratiti sandučić na nulu.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Izvozim poruke iz %s u %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ne mogu kopirati poruku %s u %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "Ne mogu otvoriti označenu datoteku.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "izvorni spis jednak je destinaciji.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -322,7 +318,7 @@ msgstr ""
 "Datoteka `%s' već postoji.\n"
 "Ne mogu stvoriti spis."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -334,77 +330,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "uspostavljam NNTP vezu s %s:%d ...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 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:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "članak %d već je pohranjen.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "primam članak %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "ne mogu pročitati članak %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "ne mogu poslati članak.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "ne mogu primiti članak %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "ne mogu odabrati grupu %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "pogrešan opseg članaka: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "nema novih članaka.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "primam xover %d - %d u %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "ne mogu dobiti xover\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "došlo je do greške prilikom dobivanja xovera.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "pogrešna xover linija: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "ne mogu dobiti xhdr\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "došlo je do greške prilikom dobivanja xhdra.\n"
 
@@ -463,30 +459,30 @@ msgstr "Brišim duplicirane poruke..."
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "Šaljem poruku (%d / %d bytea)"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 #, fuzzy
 msgid "mailbox is locked\n"
 msgstr "Postavke sandučića"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr ""
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 #, fuzzy
 msgid "can't start TLS session\n"
 msgstr "Korsiti STARTTLS naredbu za pokretanje SSL-a"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "greška prilikom ovjeravanja\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 #, fuzzy
 msgid "command not supported\n"
 msgstr "Naredba"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "greška prilikom ovjeravanja\n"
@@ -520,16 +516,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:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "ne mogu otvoriti obilježenu datoteku\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ne mogu dohvatiti poruku %d\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Naredba za ispis nije dobra: `%s'\n"
@@ -686,7 +682,7 @@ msgstr ""
 "Nove poruke biti će provjerene ovim redom. Označite pod\n"
 "S one račune s kojih želite skinuti poštu sa `Primi sve'."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -824,7 +820,7 @@ msgstr "Dodaj adresu u adresar"
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Bilješke"
@@ -833,30 +829,30 @@ msgstr "Bilješke"
 msgid "Select Address Book Folder"
 msgstr "Odaberite spis adresara"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _knjiga"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _V-kartica"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 #, fuzzy
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Novi _J-Pilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _poslužitelj"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -864,101 +860,101 @@ msgstr "/_Datoteka/Novi _poslužitelj"
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Uredi"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Obriši"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Spremi"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Uredi"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Uredi/_Kopiraj"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/U_baci"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nova _adresa"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nova _grupa"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Novi _spis"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/_Adresa/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Uredi"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Alati"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Nova _adresa"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Nova _grupa"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Novi _spis"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -971,82 +967,88 @@ msgstr "/Novi _spis"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Obriši"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopiraj..."
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Uredi/U_baci"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "E-mail adresa"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresar"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Spis"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "E-mail adresa"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ime:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Potraži"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 #, fuzzy
 msgid "_Close"
 msgstr "Zatvori"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Obriši adresu/e"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Uistinu obrisati adresu/e?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1055,38 +1057,38 @@ msgstr ""
 "Želite li obrisati spis I sve adrese u `%s' ? \n"
 "Ukoliko brišete samo spis, adrese će biti premještene u prethodni spis."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Obriši spis"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo spis"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Spis i adrese"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Uistinu obrisati `%s' ?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu spretmiti index datoteku."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu spremiti datoteke adresara."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspješno unešen."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1094,7 +1096,7 @@ msgstr ""
 "Stari adresar ne može biti unešen,\n"
 "ne mogu spremiti novu index datoteku adresara."
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1102,7 +1104,7 @@ msgstr ""
 "Ne mogu unjeti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1110,7 +1112,7 @@ msgstr ""
 "Ne mogu unjeti adresar,\n"
 "ne mogu kreirati nove datoteke adresara."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1118,90 +1120,84 @@ msgstr ""
 "Ne mogu unjeti adresar,\n"
 "i ne mogu stvoriti nove datoteke adresara."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr "Stari adresar unešen, ne mogu spremiti index datoteke novih adresa"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Ne mogu unjeti adresar, kreiram prazne datoteke novog adresara."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Ne mogu unjeti adresar, ne mogu kreirati nove datoteke adresara."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Ne mogu unjeti adresar i ne mogu kreirati nove datoteke adresara."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Sučelje"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Grupa"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Spis"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "V-kartica"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 #, fuzzy
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "LDAP Poslužitelj"
 
@@ -1213,15 +1209,15 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Obavijest"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Greška"
 
@@ -1264,7 +1260,7 @@ msgstr "Smeđa"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Ništa"
 
@@ -1647,8 +1643,8 @@ msgstr "Poruka: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedjelne poruke."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
@@ -1838,7 +1834,7 @@ msgstr "MIME tip"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Veličina"
 
@@ -2088,12 +2084,12 @@ msgstr "Uredi spis"
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog spisa:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Novi spis"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog spisa:"
 
@@ -2239,7 +2235,7 @@ msgstr "Iznesi"
 msgid "Specify source folder and destination file."
 msgstr "Odredite ciljanu mbox datoteku i destinacijski spis."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Format datuma"
@@ -2254,7 +2250,7 @@ msgstr "Izvorni dir:"
 msgid "Destination:"
 msgstr "Destinacija"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2266,7 +2262,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Odaberite... "
@@ -2330,23 +2326,23 @@ msgstr "Smeće"
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "NoviSpis"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' ne može biti uključen u ime spisa."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Spis `%s' već postoji."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu stvoriti spis `%s'."
@@ -2483,32 +2479,32 @@ msgstr "Kreiranje nove pošte"
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Spis %s je odabran\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 #, fuzzy
 msgid "Download all messages"
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2518,26 +2514,26 @@ msgstr ""
 "(ukoliko želite stvoriti spis za pohranjivanje podspisa,\n"
 "dodajte `/' na kraju imena)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Preimenuj spis"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2546,12 +2542,12 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NEĆE biti obrisane s diska)"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Obriši spis"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2562,21 +2558,21 @@ msgstr ""
 "Svi spisi i poruke pod `%s' biti će obrisane.\n"
 "Želite li ih uistinu obrisati?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2585,35 +2581,35 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NEĆE biti obrisane s diska)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/_Ukloni sandučić"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Uistinu obrisati `%s' IMAP4 račun?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 račun"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Uistinu obrisati `%s' news grupu?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Uistinu obrisati `%s' news račun?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Obriši news račun"
 
@@ -2625,8 +2621,8 @@ msgstr "News grupe:"
 msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Bez pošiljatelja)"
 
@@ -2638,71 +2634,71 @@ msgstr "Kreiram pregled slika...\n"
 msgid "Can't load the image."
 msgstr "Ne mogu prikazati sliku."
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Odredite ciljanu mbox datoteku i destinacijski spis."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Pretražujem spis %s ..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Uvezi"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Pretražujem spis %s ..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Došlo je do greške prilikom slanja\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Uvezi"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Odredite ciljanu mbox datoteku i destinacijski spis."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Izvorni dir:"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Destinacijski dir:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Novi spis"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Odredite ciljanu mbox datoteku i destinacijski spis."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Odaberite datoteku za uvoz"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Odaberite datoteku za uvoz"
 
@@ -2874,219 +2870,219 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Attributes"
 msgstr "Atributi korisnika"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "\t%d novih poruka\n"
 
-#: src/inc.c:477
+#: src/inc.c:478
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autorizacija"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Primam nove poruke"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "Standby"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Primam"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Ukloni poruke sa poslužitelja nakon primanja"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Nema nepročitanih poruka."
 
-#: src/inc.c:708
+#: src/inc.c:715
 msgid "Done"
 msgstr "Gotovo"
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Veza nije uspjela"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Identifikacija nije uspjela"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:730
+#: src/inc.c:737
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "Finished (%d new message(s))"
 msgstr "\t%d novih poruka\n"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, fuzzy, c-format
 msgid "Finished (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:792
+#: src/inc.c:796
 #, fuzzy
 msgid "Some errors occurred while getting mail."
 msgstr "Došlo je do grešaka prilikom primanja pošte."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "primam nove poruke s računa %s...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autorizacija"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Primam nove poruke"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se na POP3 poslužitelj: %s ..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne mogu se povezati na POP3 poslužitelj: %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Primam broj novih poruka (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Primam broj novih poruka (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Primam broj novih poruka (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Primam veličinu poruka (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, fuzzy, c-format
 msgid "Deleting message %d"
 msgstr "Brišem poruke"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Izlazim"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 #, fuzzy
 msgid "Connection failed."
 msgstr "Veza nije uspjela"
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Nema više mjesta na disku."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 #, fuzzy
 msgid "Can't write file."
 msgstr "Ne mogu pisati u datoteku.\n"
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 #, fuzzy
 msgid "Socket error."
 msgstr "protokol greška\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "Postavke sandučića"
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Postavke sandučića"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autorizacija"
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autorizacija"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 #, fuzzy
 msgid "Incorporation cancelled\n"
 msgstr "Prima novu poštu"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Primam nove poruke s %s u %s...\n"
@@ -3100,98 +3096,94 @@ msgstr "Unesite lozinku za %s na %s:"
 msgid "Input password"
 msgstr "Unesite lozinku"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Zapis protokola"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread nije podržan od glib-a.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]     otvara prozor za pisanje"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prima nove poruke"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          prima sve poruke sa svih računa"
 
-#: src/main.c:541
+#: src/main.c:553
 #, fuzzy
 msgid "  --send                 send all queued messages"
 msgstr "  --recive              prikazuje broj poruka"
 
-#: src/main.c:542
+#: src/main.c:554
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --recive              prikazuje broj poruka"
 
-#: src/main.c:543
+#: src/main.c:555
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --recive              prikazuje broj poruka"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:550
+#: src/main.c:562
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                debug način"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug način"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 prikazuje ovu pomoć i izlazi"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              prikazuje verziju i izlazi"
 
-#: src/main.c:557
+#: src/main.c:569
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "ili pritisnite `y´ tipku.\n"
 "\n"
 
-#: src/main.c:638
+#: src/main.c:694
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Izlazni charset"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3205,19 +3197,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "Pisanje poruke postoji. Uistinu prekinuti?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Odložene poruke"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Neke neposlane poruke su odložene. Izaći odmah?"
 
-#: src/main.c:787
+#: src/main.c:843
 #, fuzzy
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
@@ -3226,17 +3218,21 @@ msgstr ""
 "GnuPG nije pravilno instaliran.\n"
 "OpenPGP podrška je onemogućena."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "drugi Sylpheed već radi.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pišem konfiguraciju filtera...\n"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3991,8 +3987,8 @@ msgstr "Kreiram glavne prozore...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: prikaz boje %d nije uspio\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "gotovo.\n"
 
@@ -4239,7 +4235,7 @@ msgstr "Prilog"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
@@ -6382,19 +6378,19 @@ msgstr "Prilog"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Datum"
 
@@ -6404,7 +6400,7 @@ msgid "Number"
 msgstr "Broj"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 #, fuzzy
 msgid "To"
 msgstr "Za:"
@@ -6709,31 +6705,31 @@ msgstr "%d poruka pronađeno.\n"
 msgid "%d messages found."
 msgstr "%d poruka pronađeno.\n"
 
-#: src/query_search.c:579
-#, fuzzy, c-format
-msgid "Searching %s ..."
-msgstr "Pretražujem spis %s ..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, fuzzy, c-format
+msgid "Searching %s ..."
+msgstr "Pretražujem spis %s ..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Traži spis"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 #, fuzzy
 msgid "Location:"
 msgstr "Citat"
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 #, fuzzy
 msgid "Folder name:"
 msgstr "Ime datoteke"
@@ -6784,7 +6780,7 @@ msgstr ""
 msgid "Signature made at %s\n"
 msgstr "Potpis napravio/la %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Greška pri potvrđivanju potpisa"
 
@@ -6813,7 +6809,7 @@ msgstr "O"
 msgid "%s - POP3 Remote mailbox"
 msgstr "/_Ukloni sandučić"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "Ne."
 
@@ -6839,58 +6835,58 @@ msgid ""
 "%s"
 msgstr "greška prilikom ovjeravanja\n"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Šaljem poruku (%d / %d bytea)"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Primam broj novih poruka (STAT)..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 #, fuzzy
 msgid "No message"
 msgstr "Nema nepročitanih poruka."
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Obriši poruku/e"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Završavam..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Primam nove poruke"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Pošalji poruku"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Primam nove poruke"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 #, fuzzy
 msgid "Delete messages"
 msgstr "Obriši poruku/e"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6968,81 +6964,81 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Spajam se na SMTP poslužitelj: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 #, fuzzy
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, fuzzy, c-format
 msgid "Sending HELO..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 #, fuzzy
 msgid "Authenticating"
 msgstr "Autorizacija"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 #, fuzzy
 msgid "Sending message..."
 msgstr "Šaljem poruku"
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, fuzzy, c-format
 msgid "Sending EHLO..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Šaljem"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Šaljem RCPT TO..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Šaljem DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Šaljem poruku (%d / %d bytea)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr ""
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Šaljem poruku"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "Došlo je do greške prilikom slanja poruke."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
 "%s"
 msgstr "Došlo je do greške prilikom slanja poruke."
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 #, fuzzy
 msgid "Can't connect to SMTP server."
 msgstr "Ne mogu se povezati na SMTP poslužitelj: %s:%d\n"
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, fuzzy, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Ne mogu se povezati na SMTP poslužitelj: %s:%d\n"
@@ -7071,71 +7067,71 @@ msgstr "Prikaži potpis u popup prozoru"
 msgid "Checking signature"
 msgstr "/Pro_vjeri potpis"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr ""
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Nema potpisa"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobar potpis od \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Dobar potpis"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr ""
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 #, fuzzy
 msgid "Signature valid but expired"
 msgstr "Potpis napravio/la %s\n"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr ""
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr ""
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr ""
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr ""
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "LOŠ potpis od \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "LOŠ potpis"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "Nema javnog ključa za potvrdu potpisa"
 
@@ -7234,7 +7230,7 @@ msgstr "Ne mogu pronaći listu news grupa."
 msgid "Can't retrieve newsgroup list."
 msgstr "Ne mogu pronaći listu news grupa."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Gotovo."
 
@@ -7374,226 +7370,226 @@ msgstr "Neke oznake su izostavljene. Izvršiti ih?"
 msgid "Scanning folder (%s)..."
 msgstr "Pregledavam spis (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 #, fuzzy
 msgid "_Search again"
 msgstr "Polje potrage"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "Nema više nepročitanih poruka. Nastaviti u slijedeći spis?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 #, fuzzy
 msgid "No more new messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 #, fuzzy
 msgid "No new message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 #, fuzzy
 msgid "No new messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 #, fuzzy
 msgid "No new message found. Go to next folder?"
 msgstr "Nema više nepročitanih poruka. Nastaviti u slijedeći spis?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Nema više označenih poruka"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "Nema više označenih poruka. Nastaviti od kraja?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Nema označenih poruka."
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nema označenih poruka. Tražiti od početka?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Nema više label poruka"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "Nema label poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Nema label poruka."
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nema label poruka. Krenuti od početka?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Prihvaćam poruke po temi..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d obrisano"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d premješteno"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopirano"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " jedinica odabrano"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d nepročitanih, %d ukupno (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d nepročitanih, %d ukupno"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Slažem pregled..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tPostavljam pregled od podataka poruke..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Postavljam pregled od podataka poruke..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišem pohranu pregleda (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Želite li uistinu obrisati poruke iz smeća?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Brišim duplicirane poruke..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Poruka %d je označena za premještanje u %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "Destinacija je ista kao i trenutni spis."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Odaberite spis"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Poruka %d je označena za kopiranje u %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Destinacija za kopiranje je ista kao i trenutni spis."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Odaberite spis"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Izgrađujem stablo..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Rasipavam..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
@@ -7688,35 +7684,41 @@ msgstr "Šalje odložene poruke"
 msgid "E_xit"
 msgstr "Izlaz"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 msgid "Sylpheed"
 msgstr ""
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "Nema potpisa"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "Informacije o poslužitelju"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "drugi Sylpheed već radi.\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "Ne mogu otvoriti označenu datoteku.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "g_thread nije podržan od glib-a.\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "Uvozim datoteku:"
 
diff --git a/po/hu.po b/po/hu.po
index dad6a079..d3cccde5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-13 11:38+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+0900\n"
 "PO-Revision-Date: 2009-08-15 13:25+0200\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: Hungarian <NONE>\n"
@@ -20,226 +20,226 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Beállítások beolvasása az összes fiókhoz...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Az IMAP4 kapcsolat %s felé megszakadt. Újrakapcsolódás...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Az IMAP4 szerveren LOGIN kikapcsolva.\n"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "%s:%d IMAP4 kapcsolat létrehozása ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "Nem lehet TLS menetet indítani.\n"
 
-#: libsylph/imap.c:1176
-#, c-format
-msgid "Getting message %d"
+#: libsylph/imap.c:1230
+#, fuzzy, c-format
+msgid "Getting message %u"
 msgstr "%d levél letöltése"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Levelek hozzáfűzése ide: %s (%d / %d)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "%s levél áthelyezése ide: %s ..."
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "%s levél másolása ide: %s ..."
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, c-format
 msgid "Removing messages %s"
 msgstr "%s levél eltávolítása"
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, 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:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "nem lehet törölni\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Minden levél törlése ebből: %s?"
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 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:1678
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "mappa bezárása nem sikerült\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "%s gyökérmappa nem létezik\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "hiba történt a LIST lekérdezése közben.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "'%s' nem hozható létre\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "'%s' nem hozható létre a BEJÖVŐ mappában\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nem lehet létrehozni postaládát: LIST sikertelen\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "nem lehet létrehozni postaládát\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, 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:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "nem lehet törölni a postaládát\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "a borítékot nem lehet megszerezni\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Levélfejlécek letöltése (%d / %d)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "a borítékot nem lehet megszerezni\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "hiba történt a boríték fogadása közben.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "nem lehet értelmezni a borítékot: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, 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:2714
+#: libsylph/imap.c:2863
 #, 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:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "névtér nem elérhető\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "%s mappát nem lehet kiválasztani\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 msgid "error on imap command: STATUS\n"
 msgstr "hiba az IMAP parancs közben: STATUS\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "Az IMAP4 azonosítás nem sikerült.\n"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 bejelentkezés sikertelen.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s nem fűzhető hozzá ehhez: %s\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(fájl küldése...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "levél nem fűzhető hozzá ehhez: %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s nem másolható ide: %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, 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:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "hiba az IMAP parancs közben: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "hiba az IMAP parancs közben: CLOSE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "az iconv nem tud UTF-7-ből konvertálni ebbe: %s\n"
 
-#: libsylph/imap.c:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "az iconv nem tudja UTF-7-re konvertálni ezt: %s\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "nem lehet az ideiglenes fájlba írni\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Levelek fogadása innen: %s ide: %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "az mbox fájlt nem lehet olvasni.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "érvénytelen mbox formátum: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "sérült mbox: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "nem lehet ideiglenes fájlt megnyitni\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -248,66 +248,62 @@ msgstr ""
 "kódolatlan Feladó található:\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "%s zároló fájlt nem lehet létrehozni\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "'flock' használata 'file' helyett, ha lehet.\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "%s nem hozható létre\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "A postaláda egy másik processzhez tartozik, várakozás...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "%s nem zárolható\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "érvénytelen zároló típus\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "%s zárolása nem oldható fel\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "nem lehet nulla méretűre változtatni a postaládát.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Levelek exportálása innen: %s ide: %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "%s levél nem másolható ide: %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "A jelölő fájlt nem lehet megnyitni.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "A forrás- és célmappa azonos.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "%s/%d levél másolása ide: %s ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -316,7 +312,7 @@ msgstr ""
 "`%s' fájl már létezik.\n"
 "Mappa nem hozható létre."
 
-#: libsylph/mh.c:1557
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -335,77 +331,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "NNTP kapcsolat létesítése %s:%d ...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 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:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "%d cikk már a gyorstárban van.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "%d cikk fogadása...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "%d cikk nem olvasható\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "A cikk nem küldhető el.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "%d cikket nem lehet fogadni\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "%s csoport nem választható ki\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "érvénytelen cikk tartomány: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "Nincsenek új cikkek.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "%d - %d hírjegyzék fogadása ide: %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "A hírjegyzék nem elérhető\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "Hiba a hírjegyzék fogadása közben.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "érvénytelen hírjegyzék sor: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "xhdr nem elérhető\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "Hiba történt xhdr letöltése közben.\n"
 
@@ -462,27 +458,27 @@ msgstr "POP3: Lejárt levelek törlése %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: %d levél átugrása (%d bájt)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "a postaláda zárolt\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "kapcsolat időtúllépése\n"
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "nem lehet TLS menetet indítani\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "Hiba történt az azonosításkor\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "A parancs nem támogatott\n"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "hiba történt a POP3 kapcsolat közben\n"
 
@@ -513,16 +509,16 @@ msgstr "Levélszemét szűrés"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Kód konverziós hiba.\n"
 
-#: libsylph/procmsg.c:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "A kijelölt fájl nem nyitható meg\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "%d levél letöltése nem sikerült\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Érvénytelen nyomtató parancs: `%s'\n"
@@ -680,7 +676,7 @@ msgstr ""
 "letöltése'\n"
 "funkció bekapcsolásához tegyen pipát a 'G' oszlopban levő négyzetbe!"
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -822,7 +818,7 @@ msgstr "Cím hozzáadása a címjegyzékhez"
 msgid "Address"
 msgstr "Cím"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Megjegyzések"
@@ -831,28 +827,28 @@ msgstr "Megjegyzések"
 msgid "Select Address Book Folder"
 msgstr "Címjegyzék mappa választás"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fájl"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_Fájl/Új _Címjegyzék"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_Fájl/Új _vCard"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/_Fájl/Új _JPilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fájl/Új _LDAP Szerver"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -860,100 +856,100 @@ msgstr "/_Fájl/Új _LDAP Szerver"
 msgid "/_File/---"
 msgstr "/_Fájl/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_Fájl/_Szerkesztés"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_Fájl/_Törlés"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_Fájl/_Mentés"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fájl/_Bezárás"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/S_zerkesztés"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/S_zerkesztés/_Másolás"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/S_zerkesztés/_Beillesztés"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/_Cím"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/_Cím/Új _cím"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/_Cím/Új cso_port"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/_Cím/Új _mappa"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/_Cím/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/_Cím/_Szerkesztés"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/_Cím/_Törlés"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Eszközök"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Eszközök/_LDIF fájl importálása"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Eszközök/_CSV fájl importálása"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Súgó"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Súgó/_Névjegy"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Új _cím"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Új cso_port"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Ú_j Mappa"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -966,79 +962,85 @@ msgstr "/Ú_j Mappa"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Törlés"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 msgid "/_Copy"
 msgstr "/_Másolás"
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 msgid "/_Paste"
 msgstr "/_Beillesztés"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "Email cím"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Címjegyzék"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Mappa"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "Email cím"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Név:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Címzett:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Másolat:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Titkos másolat:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Előnézet"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 msgid "_Close"
 msgstr "Be_zárás"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Cím(ek) törlése"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Tényleg töröljem a cím(ek)et?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1047,36 +1049,36 @@ msgstr ""
 "Tényleg törölni szeretné a(z) `%s' mappát ÉS az összes címet benne?\n"
 "Ha csak a mappát törli, a címek átkerülnek a szülő mappába."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "_Folder only"
 msgstr "Cs_ak mappa"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "Folder and _addresses"
 msgstr "Mappa és _címek"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Tényleg törli `%s' elemet?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Az új felhasználó nem tudja menteni az index fájlt."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Az új felhasználó nem tudja menteni a címjegyzék fájlt."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "A régi címjegyzék konvertálása sikerült."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1084,7 +1086,7 @@ msgstr ""
 "A régi címjegyzék konvertálva,\n"
 "nem sikerült menteni az új cím index fájlt."
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1092,7 +1094,7 @@ msgstr ""
 "Nem sikerült a címjegyzék konvertálása,\n"
 "de létrehoztam egy üres új címjegyzéket."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1100,7 +1102,7 @@ msgstr ""
 "Nem sikerült a címjegyzék konvertálása,\n"
 "és nem sikerült az új címjegyzék létrehozása sem."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1108,88 +1110,82 @@ msgstr ""
 "Nem sikerült a címjegyzék konvertálása,\n"
 "és nem sikerült az új címjegyzék létrehozása sem."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 msgid "Address book conversion error"
 msgstr "Címjegyzék konvertálási hiba"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 msgid "Address book conversion"
 msgstr "Címjegyzék konvertálása"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 msgid "Address Book Error"
 msgstr "Címjegyzék hiba"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Cím index olvasása nem sikerült"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "A régi címjegyzék konvertálva, nem sikerült menteni az új cím index fájlt."
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Nem konvertálható a címjegyzék, de létrehoztam egy új üres címjegyzéket."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Nem konvertálható a címjegyzék, és nem hozható létre új címjegyzék sem."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Nem konvertálható a címjegyzék, és nem hozható létre új címjegyzék sem."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 msgid "Address Book Conversion Error"
 msgstr "Címjegyzék konvertálási hiba"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 msgid "Address Book Conversion"
 msgstr "Címjegyzék konvertálása"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Illesztő"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Címjegyzék"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Személy"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "Email cím"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Csoport"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Mappa"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "LDAP Szerver"
 
@@ -1201,15 +1197,15 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Megjegyzés"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Hiba"
 
@@ -1252,7 +1248,7 @@ msgstr "Barna"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4942
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Semmi"
 
@@ -1583,8 +1579,8 @@ msgstr "Levél: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Egy több részes levél egy darabja nem hozzáférhető."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2271
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
 
@@ -1778,7 +1774,7 @@ msgstr "MIME típus"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5091
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Méret"
 
@@ -2018,12 +2014,12 @@ msgstr "Mappa szerkesztése"
 msgid "Input the new name of folder:"
 msgstr "A mappa új neve:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Új mappa"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Az új mappa neve:"
 
@@ -2166,7 +2162,7 @@ msgstr "Exportálás"
 msgid "Specify source folder and destination file."
 msgstr "Adja meg a forrásmappát és a célfájlt!"
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 msgid "File format:"
 msgstr "Fájlformátum:"
 
@@ -2178,7 +2174,7 @@ msgstr "Forrásmappa:"
 msgid "Destination:"
 msgstr "Cél:"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr "UNIX mbox"
 
@@ -2190,7 +2186,7 @@ msgstr "eml (szám + .eml)"
 msgid "MH (number only)"
 msgstr "MH (csak szám)"
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Kiválaszt... "
@@ -2247,23 +2243,23 @@ msgstr "Kuka"
 msgid "Drafts"
 msgstr "Vázlatok"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "Új mappa"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' nem tehető a mappanévbe."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' mappa már létezik."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' nem hozható létre."
@@ -2388,31 +2384,31 @@ msgstr "Új levelek keresése minden mappában..."
 msgid "Junk"
 msgstr "Levélszemét"
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s mappa kiválasztva\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Levelek letöltése a(z) %s mappába ..."
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Összes levél letöltése a(z) %s mappába?"
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 msgid "Download all messages"
 msgstr "Összes levél letöltése"
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hiba lépett fel a(z) %s mappába történő levelek letöltésekor."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2422,26 +2418,26 @@ msgstr ""
 "(Ha egy almappákat tartalmazó mappát szeretne létrehozni,\n"
 "akkor tegyen egy `/' jelet a név végére)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Adja meg `%s' új nevét:"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Mappa átnevezése"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' mappa nem nevezhető át."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' mappa nem helyezhető át."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2450,11 +2446,11 @@ msgstr ""
 "A(z) `%s' keresési mappa törlése?\n"
 "Az eredeti levelek nem törlődnek."
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 msgid "Delete search folder"
 msgstr "Keresési mappa törlése"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2467,20 +2463,20 @@ msgstr ""
 "\n"
 "Biztosan törölni szeretné?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' mappa nem távolítható el."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Kuka ürítése"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 msgid "Delete all messages in the trash folder?"
 msgstr "Minden levél törlése a kukából?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2489,34 +2485,34 @@ msgstr ""
 "Tényleg eltávolítja `%s' postaládát?\n"
 "(A levelek NEM törlődnek a meghajtóról)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "Postaláda eltávolítása"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Tényleg törli `%s' IMAP4 fiókot?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 fiók törlése"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Tényleg törli `%s' hírcsoportot?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Hírcsoport törlése"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Tényleg törli `%s' hírfiókot?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Hírfiók törlése"
 
@@ -2528,8 +2524,8 @@ msgstr "Hírcsoportok:"
 msgid "Creating header view...\n"
 msgstr "Fejléc nézet létrehozása...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2274
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Nincs Feladó)"
 
@@ -2541,60 +2537,60 @@ msgstr "Kép nézet létrehozása...\n"
 msgid "Can't load the image."
 msgstr "Nem lehet betölteni a képet."
 
-#: src/import.c:185
+#: src/import.c:187
 msgid "The source file does not exist."
 msgstr "A forrásfájl nem létezik."
 
-#: src/import.c:196
+#: src/import.c:198
 msgid "Can't find the destination folder."
 msgstr "A célmappa nem található."
 
-#: src/import.c:201
+#: src/import.c:203
 #, c-format
 msgid "Importing %s ..."
 msgstr "%s importálása..."
 
-#: src/import.c:203
+#: src/import.c:205
 msgid "Importing"
 msgstr "Importálás"
 
-#: src/import.c:222
+#: src/import.c:224
 msgid "Scanning folder..."
 msgstr "Mappa átvizsgálása..."
 
-#: src/import.c:233
+#: src/import.c:235
 msgid "Error occurred on import."
 msgstr "Hiba történt importálás közben."
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Importálás"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 msgid "Specify source file and destination folder."
 msgstr "Adja meg a forrásfájlt és a célmappát!"
 
-#: src/import.c:328
+#: src/import.c:340
 msgid "Source:"
 msgstr "Forrás:"
 
-#: src/import.c:333
+#: src/import.c:345
 msgid "Destination folder:"
 msgstr "Célkönyvtár:"
 
-#: src/import.c:346
+#: src/import.c:358
 msgid "eml (folder)"
 msgstr "eml (mappa)"
 
-#: src/import.c:395
+#: src/import.c:407
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Adja meg az eml fájlokat tartalmazó forrásmappát és a célmappát!"
 
-#: src/import.c:425
+#: src/import.c:437
 msgid "Select importing folder"
 msgstr "Importálandó mappa választása"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Importálandó fájl választása"
 
@@ -2747,141 +2743,141 @@ msgstr "LDIF fájl importálása a címjegyzékbe"
 msgid "Attributes"
 msgstr "Tulajdonságok"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d új levél"
 
-#: src/inc.c:477
+#: src/inc.c:478
 msgid "Authenticating with POP3"
 msgstr "POP3 azonosítás"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Új levelek fogadása"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "Készenlét"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Megszakítva"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Fogadás"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, c-format
 msgid "%d message(s) (%s) received"
 msgstr "%d levél (%s) fogadva"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, c-format
 msgid "no new messages"
 msgstr "nincs új levél."
 
-#: src/inc.c:708
+#: src/inc.c:715
 msgid "Done"
 msgstr "Kész"
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Kapcsolat megszakadt"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Azonosítás nem sikerült"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Zárolt"
 
-#: src/inc.c:730
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Időtúllépés"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Befejezve (%d új levél)"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Befejezve (nincs új levél)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "Hiba történt a levelek fogadásakor."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "új levelek letöltése %s fióknál...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: POP3 azonosítás"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Új levelek fogadása"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Kapcsolódás a(z) %s POP3 szerverhez ..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nem sikerült kapcsolódni a POP3 szerverhez: %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Azonosítás..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Levelek fogadása innen: %s ..."
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Új levelek számának megszerzése (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Új levelek számának megszerzése (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Új levelek számának megszerzése (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Új levelek méretének megszerzése (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d levél törlése"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Kilépés"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Levél letöltése (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2889,15 +2885,15 @@ msgstr ""
 "A levélszemét szűréshez használt parancs futtatása nem sikerült.\n"
 "Ellenőrizze a levélszemét szűrők beállításait."
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 msgid "Connection failed."
 msgstr "Kapcsolat megszakadt."
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "Hiba a levelek feldolgozása közben."
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2906,29 +2902,29 @@ msgstr ""
 "Hiba a levelek feldolgozása közben:\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Nincs több szabad hely a lemezen."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "Nem lehet a fájlba írni."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "Socket hiba."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "A távoli fél bezárta a kapcsolatot."
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "A postaláda zárolt."
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2937,11 +2933,11 @@ msgstr ""
 "A postaláda zárolt:\n"
 "%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Az azonosítás nem sikerült."
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2950,15 +2946,15 @@ msgstr ""
 "Az azonosítás nem sikerült:\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Menet időtúllépése."
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "Fogadás megszakítva\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s új leveleinek letöltése a(z) %s mappába...\n"
@@ -2972,24 +2968,20 @@ msgstr "Adja meg %s jelszavát a(z) %s szerveren:"
 msgid "Input password"
 msgstr "Adja meg a jelszót"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Protokoll napló"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread-et a glib nem támogatja.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Használat: %s [OPCIÓ]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [cím]    szerkesztőablak megnyitása"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2999,23 +2991,23 @@ msgstr ""
 "                          szerkesztőablak nyitása a megadott fájl(ok)\n"
 "                          csatolásával"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              új levelek letöltése"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          új levelek letöltése minden fióknál"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 minden várakozó levél küldése"
 
-#: src/main.c:542
+#: src/main.c:554
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mappa]...    kiírja a levelek számát"
 
-#: src/main.c:543
+#: src/main.c:555
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3023,46 +3015,46 @@ msgstr ""
 "  --status-full [mappa]...\n"
 "                       megjeleníti minden egyes mappa állapotát"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open folderid/msgnum  levél megnyitása új ablakban"
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir dirname    a konfigurációs fájlokat tároló mappa megadása"
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "  --ipcport portszám      IPC távoli parancsok portjának megadása"
 
-#: src/main.c:550
+#: src/main.c:562
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                kilépés a Sylpheedből"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                hibakereső üzemmód"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 e segítség megjelenítése és kilépés"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              verzió információk kiírása és kilépés"
 
-#: src/main.c:557
+#: src/main.c:569
 #, c-format
 msgid "Press any key..."
 msgstr "Nyomjon meg egy billentyűt..."
 
-#: src/main.c:638
+#: src/main.c:694
 msgid "Filename encoding"
 msgstr "Fájlnév karakterkódolása"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3086,19 +3078,19 @@ msgstr ""
 "\n"
 "Folytatja?"
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "Levél szerkesztés alatt. Tényleg kilép?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Várakozó levelek"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vannak elküldetlen levelek. Kilépés most?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3106,16 +3098,20 @@ msgstr ""
 "A GnuPG nincs megfelelően telepítve, vagy túl régi a verziója.\n"
 "OpenPGP támogatás kikapcsolva."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "egy másik Sylpheed már fut.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 msgid "Migration of configuration"
 msgstr "Beállítások migrálása"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3757,8 +3753,8 @@ msgstr "Főablak létrehozása...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Főablak: %d szín foglalása nem sikerült\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4068 src/summaryview.c:4197 src/summaryview.c:4574
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "kész.\n"
 
@@ -4016,7 +4012,7 @@ msgstr "Csatolások"
 msgid "Message View - Sylpheed"
 msgstr "Levélnézet - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3626
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' fájlt nem lehet elmenteni."
@@ -6074,19 +6070,19 @@ msgstr "Csatolás"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5084
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Tárgy"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5087
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Feladó"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5089
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Dátum"
 
@@ -6096,7 +6092,7 @@ msgid "Number"
 msgstr "Sorszám"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5095
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 msgid "To"
 msgstr "Címzett"
 
@@ -6380,29 +6376,29 @@ msgstr "1 levél van."
 msgid "%d messages found."
 msgstr "%d levél van."
 
-#: src/query_search.c:579
-#, c-format
-msgid "Searching %s ..."
-msgstr "%s keresése..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "%s keresése (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
+#: src/query_search.c:709
+#, c-format
+msgid "Searching %s ..."
+msgstr "%s keresése..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Nincs Dátum)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 msgid "Save as search folder"
 msgstr "Mentés, mint keresési mappa"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr "Hely:"
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 msgid "Folder name:"
 msgstr "Mappanév:"
 
@@ -6448,7 +6444,7 @@ msgstr "\t\tazaz \"%s\"\n"
 msgid "Signature made at %s\n"
 msgstr "Az aláírás készült %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Hiba az aláírás ellenőrzése közben"
 
@@ -6473,7 +6469,7 @@ msgstr "_Névjegy"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - POP3 Távoli postaláda"
 
-#: src/rpop3.c:414 src/summaryview.c:5093
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "Ssz."
 
@@ -6500,55 +6496,55 @@ msgstr ""
 "Hiba történt a POP3-as munkamenet közben:\n"
 "%s"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Levélfejlécek letöltése (%d / %d) ..."
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 msgid "Getting the number of messages..."
 msgstr "Új levelek számának megszerzése..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 msgid "No message"
 msgstr "Nincs levél"
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, c-format
 msgid "Deleted %d messages"
 msgstr "%d levél törölve"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Kilépés..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, c-format
 msgid "Retrieved %d messages"
 msgstr "%d levél fogadva"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, c-format
 msgid "Opened message %d"
 msgstr "%d levél megnyitva"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, c-format
 msgid "Retrieved %d message headers"
 msgstr "%d levélfejléc fogadva"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, c-format
 msgid "Retrieving message %d ..."
 msgstr "%d levél fogadása ..."
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 msgid "Delete messages"
 msgstr "Levelek törlése"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6631,66 +6627,66 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Kapcsolódás %s SMTP szerverhez..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Hiba történt a QUIT parancs után (mellőzve)"
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "HELO küldése..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "Azonosítás"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 msgid "Sending message..."
 msgstr "Levél küldése ..."
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "EHLO küldése..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM küldése..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Küldés"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO küldése..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "DATA küldése..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Levél küldése (%d / %d bájt)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr "%d / %d bájt"
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Levél küldése"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "Hiba történt a levélküldés közben."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6699,11 +6695,11 @@ msgstr ""
 "Hiba történt a levél küldése közben:\n"
 "%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 msgid "Can't connect to SMTP server."
 msgstr "Nem lehet csatlakozni az SMTP szerverhez."
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Nem lehet csatlakozni az SMTP szerverhez: %s:%d"
@@ -6728,70 +6724,70 @@ msgstr "Aláírásellenőrzés eredménye"
 msgid "Checking signature"
 msgstr "Digitális aláírás ellenőrzése"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s \"%s\"-ból/ből"
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Nem található digitális aláírás"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Jó digitális aláírás \"%s\"-tól/től"
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Jó digitális aláírás"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Érvényes aláírás, de a(z) \"%s\" kulcs nem megbízható"
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Érvényes aláírás (megbízhatatlan kulcs)"
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr "Érvényes aláírás, de \"%s\" lejárt"
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 msgid "Signature valid but expired"
 msgstr "Érvényes aláírás, de lejárt"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr "Érvényes aláírás, de \"%s\" aláíró kulcsa lejárt"
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr "Érvényes aláírás, de az aláíró kulcs lejárt"
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr "Érvényes aláírás, de \"%s\" aláíró kulcsa vissza lett vonva"
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr "Érvényes aláírás, de az aláíró kulcs vissza lett vonva"
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\" digitális aláírás ROSSZ"
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "ROSSZ digitális aláírás"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "Nincs publikus kulcs az aláírás ellenőrzéséhez"
 
@@ -6894,7 +6890,7 @@ msgstr "Hírcsoport lista letöltése..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Nem lehet olvasni a hírcsoportok listáját."
 
-#: src/subscribedialog.c:526 src/summaryview.c:883
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Kész."
 
@@ -7003,230 +6999,235 @@ msgstr "/Szűrési szabály _létrehozása/_Tárgy alapján"
 msgid "Creating summary view...\n"
 msgstr "Áttekintő nézet létrehozása...\n"
 
-#: src/summaryview.c:671
+#: src/summaryview.c:641
+#, fuzzy, c-format
+msgid "Scanning folder (%s) (%d)..."
+msgstr "(%s) mappa átvizsgálása..."
+
+#: src/summaryview.c:694
 msgid "Process mark"
 msgstr "Kijelöltek feldolgozása"
 
-#: src/summaryview.c:672
+#: src/summaryview.c:695
 msgid "Some marks are left. Process it?"
 msgstr "Maradt még néhány kijelölt. Feldolgoás?"
 
-#: src/summaryview.c:728
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "(%s) mappa átvizsgálása..."
 
-#: src/summaryview.c:1390
+#: src/summaryview.c:1420
 msgid "_Search again"
 msgstr "Keresés ú_jra"
 
-#: src/summaryview.c:1411 src/summaryview.c:1420
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Nincs további olvasatlan levél"
 
-#: src/summaryview.c:1412
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "Nem található olvasatlan levél. Keresés a végéről?"
 
-#: src/summaryview.c:1414
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Nincs olvasatlan levél.."
 
-#: src/summaryview.c:1421
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "Nem található olvasatlan levél. Ugrás a következő mappára?"
 
-#: src/summaryview.c:1429 src/summaryview.c:1438
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Nincs több új levél"
 
-#: src/summaryview.c:1430
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "Nem található új levél. Keresés a végéről?"
 
-#: src/summaryview.c:1432
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Nincs új levél."
 
-#: src/summaryview.c:1439
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "Nem található új levél. Ugrás a következő mappára?"
 
-#: src/summaryview.c:1447 src/summaryview.c:1456
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Nincs további kijelölt levél"
 
-#: src/summaryview.c:1448
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "Nem található kijelölt levél. Keresés a végéről?"
 
-#: src/summaryview.c:1450 src/summaryview.c:1459
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Nincs kijelölt levél."
 
-#: src/summaryview.c:1457
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nem található kijelölt levél. Keresés az elejéről?"
 
-#: src/summaryview.c:1465 src/summaryview.c:1474
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Nincs további címkézett levél."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "Nem található címkézett levél. Keresés a végéről?"
 
-#: src/summaryview.c:1468 src/summaryview.c:1477
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Nincs címkézett levél."
 
-#: src/summaryview.c:1475
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nem található címkézett levél. Keresés az elejéről?"
 
-#: src/summaryview.c:1822
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Levelek rendezése tárgy szerint..."
 
-#: src/summaryview.c:2016
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d törölve"
 
-#: src/summaryview.c:2020
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d mozgatva"
 
-#: src/summaryview.c:2021 src/summaryview.c:2026
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2025
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d másolva"
 
-#: src/summaryview.c:2040
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " elem kiválasztva"
 
-#: src/summaryview.c:2062
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d új, %d olvasatlan, %d összesen (%s)"
 
-#: src/summaryview.c:2066
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d új, %d olvasatlan, %d összesen"
 
-#: src/summaryview.c:2102
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Összefoglaló rendezése..."
 
-#: src/summaryview.c:2358
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tÖsszefoglaló beállítása a levelek adataiból..."
 
-#: src/summaryview.c:2360
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Összefoglaló beállítása a levelek adataiból..."
 
-#: src/summaryview.c:2467
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Összefoglaló gyorstár írása (%s)..."
 
-#: src/summaryview.c:2827
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "%d levél kijelölve\n"
 
-#: src/summaryview.c:2895
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "%d levél olvasottnak jelölve\n"
 
-#: src/summaryview.c:3096
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "%d levél olvasatlannak jelölve\n"
 
-#: src/summaryview.c:3157
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "%s/%d levél törlésre kijelölve\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Levél(ek) törlése"
 
-#: src/summaryview.c:3186
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Tényleg törölni szeretné az levél(eke)t a kukából?"
 
-#: src/summaryview.c:3260
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Több példányban létező levelek törlése..."
 
-#: src/summaryview.c:3298
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "%s/%d levél kijelölésének megszüntetése\n"
 
-#: src/summaryview.c:3358
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "%d levél kijelölve %s mappába mozgatásra\n"
 
-#: src/summaryview.c:3390
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "A cél azonos az aktuális mappával."
 
-#: src/summaryview.c:3427
+#: src/summaryview.c:3459
 msgid "Select folder to move"
 msgstr "Áthelyezendő mappa kiválasztása"
 
-#: src/summaryview.c:3457
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "%d levél kijelölve a(z) %s mappába másolásra\n"
 
-#: src/summaryview.c:3488
+#: src/summaryview.c:3520
 msgid "Destination for copy is same as current folder."
 msgstr "A másolás célja megegyezik az aktuális mappával."
 
-#: src/summaryview.c:3524
+#: src/summaryview.c:3556
 msgid "Select folder to copy"
 msgstr "Másolandó mappa kiválasztása"
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3701
 msgid "Error occurred while processing messages."
 msgstr "Hiba a levelek feldolgozása közben."
 
-#: src/summaryview.c:3975 src/summaryview.c:3976
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Szálak felépítése..."
 
-#: src/summaryview.c:4126 src/summaryview.c:4127
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Szál lebontása..."
 
-#: src/summaryview.c:4420 src/summaryview.c:4481
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Szűrés (%d / %d)..."
 
-#: src/summaryview.c:4543
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "szűrés..."
 
-#: src/summaryview.c:4544
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Szűrés..."
 
-#: src/summaryview.c:4581
+#: src/summaryview.c:4613
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d levél szűrése megtörtént."
@@ -7316,11 +7317,11 @@ msgstr "Levél(ek) küldése a _Várakozó sorból"
 msgid "E_xit"
 msgstr "_Kilépés"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
@@ -7328,18 +7329,24 @@ msgstr ""
 "Létezik újabb verzió a Sylpheedből.\n"
 "Frissíti most?"
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 msgid "New version found"
 msgstr "Új verzió található"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 msgid "Information"
 msgstr "Információ"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 msgid "Sylpheed is already the latest version."
 msgstr "A Sylpheed jelenleg a legújabb verziójú."
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr "A verzió adatok nem szerezhetők meg."
+
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "A jelölő fájlt nem lehet megnyitni.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "g_thread-et a glib nem támogatja.\n"
diff --git a/po/it.po b/po/it.po
index 4347c671..19a5c667 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+0900\n"
 "PO-Revision-Date: 2008-01-26 09:42+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it,dbodei@katamail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -19,226 +19,226 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Lettura della configurazione per ogni account...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connessione IMAP4 a %s è stata interrotta. Riconnessione...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Il server IMAP4 disabilita il LOGIN.\n"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "creazione della connessione IMAP4 a %s:%d ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "Impossibile avviare la sessione TLS.\n"
 
-#: libsylph/imap.c:1176
-#, c-format
-msgid "Getting message %d"
+#: libsylph/imap.c:1230
+#, fuzzy, c-format
+msgid "Getting message %u"
 msgstr "Ricezione del messaggio %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Aggiunta di messaggi in %s (%d / %d)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Spostamento dei messaggi da %s in %s ..."
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copia dei messaggi da %s in %s ..."
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, c-format
 msgid "Removing messages %s"
 msgstr "Rimozione messaggi %s"
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "impossibile impostare i flag eliminati: %s\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "impossibile cancellare\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Rimozione di tutti i messaggi in %s"
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 msgid "can't set deleted flags: 1:*\n"
 msgstr "impossibile impostare i flag eliminati: 1:*\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "impossibile chiudere la cartella\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "la cartella radice %s non esiste\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "si è verificato un errore durante la ricezione di LIST.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Impossibile creare «%s»\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Impossibile creare «%s» sotto IN ENTRATA\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "impossibile creare la casella postale: LIST fallito\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "impossibile creare la casella postale\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "impossibile rinominare la casella postale: %s in %s\n"
 
-#: libsylph/imap.c:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "impossibile eliminare la casella postale\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "impossibile ricevere la busta\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Ricezione intestazioni del messaggio (%d / %d)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "impossibile ricevere la busta\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "si è verificato un errore durante la ricezione della busta.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "impossibile analizzare la busta: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossibile connettersi al server IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2714
+#: libsylph/imap.c:2863
 #, 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:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "impossibile ricevere il namespace\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "impossibile selezionare la cartella: %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 msgid "error on imap command: STATUS\n"
 msgstr "errore durante il comando imap: STATUS\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autenticazione IMAP4 fallita.\n"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "Login IMAP4 fallito.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "impossibile aggiungere %s a %s\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(spedizione del file...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "impossibile aggiungere a %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "impossibile copiare %s in %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "errore durante il comando imap: STORE %s %s\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "errore durante il comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "errore durante il comando imap: CLOSE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv non può convertire UTF-7 in %s\n"
 
-#: libsylph/imap.c:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non può convertire %s in UTF-7\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "impossibile scrivere sul file temporaneo\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Ricezione in %s dei messaggi da %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "impossibile leggere il file mbox.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "formato mbox non valido: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "mbox non valida: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "impossibile aprire il file temporaneo\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -247,66 +247,62 @@ msgstr ""
 "trovato un Da senza la sequenza di escape:\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "impossibile creare il file di lock %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "se possibile usare «flock» al posto di «file».\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "impossibile creare %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "la casella postale è occupata da un altro processo, attendo...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "impossibile effettuare il lock %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "tipo di lock non valido\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "impossibile liberare il lock su %s\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "impossibile troncare a zero la casella postale.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Esportazione dei messaggi da %s in %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "impossibile copiare il messaggio %s in %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "impossibile aprire il file delle segnature.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "la cartella sorgente é identica a quella di destinazione.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copia del messaggio %s%d in %s ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -315,7 +311,7 @@ msgstr ""
 "Il file «%s» esiste già.\n"
 "Impossibile creare la cartella."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -334,77 +330,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "Creazione della connessione NNTP con %s:%d ...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 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:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "l'articolo %d è già nella cache.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "ricezione dell'articolo %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "impossibile leggere l'articolo %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "impossibile inviare l'articolo.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "impossibile recuperare l'articolo %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "impossibile selezionare il gruppo: %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "intervallo di articoli non valido: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "non ci sono nuovi articoli.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "ricezione di xover %d - %d in %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "impossibile ricevere xover\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "si è verificato un errore durante la ricezione di xover.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "riga xover non valida: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "impossibile ricevere xhdr\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "si è verificato un errore durante la ricezione di xhdr.\n"
 
@@ -461,27 +457,27 @@ msgstr "POP3: Eliminazione del messaggio scaduto %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Salto il messaggio %d (%d byte)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "la casella postale è bloccata\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "timeout della sessione \n"
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "impossibile avviare la sessione TLS\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "si è verificato un errore durante l'autenticazione\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "comando non supportato\n"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "si è verificato un errore durante la sessione POP3\n"
 
@@ -512,16 +508,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:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "Impossibile aprire il file delle segnature\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "impossibile prelevare il messaggio %d\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La riga di comando di stampa non è valida: «%s»\n"
@@ -678,7 +674,7 @@ msgstr ""
 "nella\n"
 "colonna «G» per consentire il recupero dei messaggi attraverso «Ricevi tutti»."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -819,7 +815,7 @@ msgstr "Aggiunta dell'indirizzo alla rubrica"
 msgid "Address"
 msgstr "Indirizzo"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Note"
@@ -828,28 +824,28 @@ msgstr "Note"
 msgid "Select Address Book Folder"
 msgstr "Selezione della cartella della rubrica"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_File"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_File/Nuova _rubrica"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_File/Nuova _vCard"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/_File/Nuovo _JPilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 msgid "/_File/New _LDAP Server"
 msgstr "/_File/Nuovo server _LDAP"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -857,100 +853,100 @@ msgstr "/_File/Nuovo server _LDAP"
 msgid "/_File/---"
 msgstr "/_File/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_File/_Modifica"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_File/_Elimina"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_File/_Salva"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_File/_Chiudi"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Modifica"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Modifica/_Copia"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Modifica/_Incolla"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/_Indirizzo"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/_Indirizzo/Nuovo _indirizzo"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/_Indirizzo/Nuovo _gruppo"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/_Indirizzo/Nuova _cartella"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/_Indirizzo/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/_Indirizzo/_Modifica"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/_indirizzo/_Elimina"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/S_trumenti"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/S_trumenti/Importa file _LDIF"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 msgid "/_Tools/Import _CSV file"
 msgstr "/S_trumenti/Importa file _CSV"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_iuto"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_iuto/I_nformazioni"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Nuovo _indirizzo"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Nuovo _gruppo"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -963,79 +959,85 @@ msgstr "/Nuova _cartella"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/Eli_mina"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 msgid "/_Copy"
 msgstr "/_Copia"
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 msgid "/_Paste"
 msgstr "/_Incolla"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "Indirizzo e-mail"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Rubrica"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Cartella"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "Indirizzo e-mail"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "A:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr " Aggiungi "
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Cerca"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 msgid "_Close"
 msgstr "_Chiudi"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Elimina l'indirizzo(i)"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Eliminare l'indirizzo(i)?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1045,36 +1047,36 @@ msgstr ""
 "Eliminando solo la cartella, gli indirizzi saranno spostati nella cartella "
 "di origine."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "_Folder only"
 msgstr "_Solo la cartella"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "Folder and _addresses"
 msgstr "Cartella e _indirizzi"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Eliminare «%s» ?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Nuovo utente, impossibile salvare il file indice."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Nuovo utente, impossibile salvare i file della rubrica."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "La vecchia rubrica è stata convertita con successo."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1082,7 +1084,7 @@ msgstr ""
 "Vecchia rubrica convertita,\n"
 "impossibile salvare il nuovo file indice dell'indirizzo"
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1090,7 +1092,7 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "ma ho creato nuovi file vuoti della rubrica."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1098,7 +1100,7 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "impossibile creare i nuovi file della rubrica."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1106,92 +1108,86 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "e impossibile creare i nuovi file della rubrica."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 msgid "Address book conversion error"
 msgstr "Errore di conversione della rubrica"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 msgid "Address book conversion"
 msgstr "Conversione della rubrica"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 msgid "Address Book Error"
 msgstr "Errore rubrica"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Impossibile leggere l'indice dell'indirizzo"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Vecchia rubrica convertita, impossibile salvare il nuovo file indice "
 "dell'indirizzo"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Impossibile convertire la rubrica, ma ho creato nuovi file vuoti della "
 "rubrica."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Impossibile convertire la rubrica, impossibile creare i nuovi file della "
 "rubrica."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Impossibile convertire la rubrica e impossibile creare i nuovi file della "
 "rubrica."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 msgid "Address Book Conversion Error"
 msgstr "Errore di conversione della rubrica"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 msgid "Address Book Conversion"
 msgstr "Errore rubrica"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Rubrica"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "Indirizzo email"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Gruppo"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Cartella"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1203,15 +1199,15 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Avviso"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Errore"
 
@@ -1254,7 +1250,7 @@ msgstr "Marrone"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Niente"
 
@@ -1585,8 +1581,8 @@ msgstr "Messaggio: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Nessun oggetto)"
 
@@ -1787,7 +1783,7 @@ msgstr "Tipo MIME"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Dimensione"
 
@@ -2028,12 +2024,12 @@ msgstr "Modifica la cartella"
 msgid "Input the new name of folder:"
 msgstr "Inserire il nuovo nome della cartella:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Nuova cartella"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Inserire il nome della nuova cartella:"
 
@@ -2180,7 +2176,7 @@ msgstr "Esporta"
 msgid "Specify source folder and destination file."
 msgstr "Specificare il file mbox da importare e la cartella di destinazione."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Formato della data"
@@ -2195,7 +2191,7 @@ msgstr "Directory di origine:"
 msgid "Destination:"
 msgstr "Directory di destinazione:"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2207,7 +2203,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Seleziona... "
@@ -2267,23 +2263,23 @@ msgstr "Cestino"
 msgid "Drafts"
 msgstr "Bozze"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "Nuova cartella"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "«%c» non può essere incluso nel nome della cartella."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La cartella «%s» esiste già."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossibile creare la cartella «%s»."
@@ -2409,31 +2405,31 @@ msgstr "Controllo per nuovi messaggi in tutte le cartelle..."
 msgid "Junk"
 msgstr "Spazzatura"
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "La cartella %s è selezionata\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sto scaricando i messaggi in %s ..."
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Scarico tutti i messaggi in «%s» ?"
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 msgid "Download all messages"
 msgstr "Scarico tutti i messaggi"
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Si è verificato un errore scaricando i messaggi in «%s»."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2443,26 +2439,26 @@ msgstr ""
 "(se si vuole creare una catella per memorizzare sottocartelle,\n"
 " aggiungere «/» alla fine del nome)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Inserire il nuovo nome per «%s»:"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Rinomina la cartella"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Impossibile rinominare la cartella «%s»."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossibile spostare la cartella «%s»."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2471,11 +2467,11 @@ msgstr ""
 "Rimuovere la cartella di ricerca «%s» ?\n"
 "I messaggi reali non saranno eliminati."
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 msgid "Delete search folder"
 msgstr "Elimina la cartella di ricerca"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2489,20 +2485,20 @@ msgstr ""
 "\n"
 "Eliminare?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossibile rimuovere la cartella «%s»."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Svuota cestino"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 msgid "Delete all messages in the trash folder?"
 msgstr "Svuotare tutti i messaggi nel cestino?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2511,34 +2507,34 @@ msgstr ""
 "Rimuovere la casella postale «%s» ?\n"
 "(I messaggi NON saranno eliminati dal disco)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "Rimuovi la casella postale"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Eliminare l'account IMAP4 «%s»?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "Elimino l'account IMAP4"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Eliminare il newsgroup «%s» ?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Elimino il newsgroup"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Eliminare l'account delle news «%s» ?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Elimino l'account delle news"
 
@@ -2550,8 +2546,8 @@ msgstr "Newsgroup:"
 msgid "Creating header view...\n"
 msgstr "Creazione della vista dell'intestazione...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Nessun mittente)"
 
@@ -2563,71 +2559,71 @@ msgstr "Creazione della vista dell'immagine...\n"
 msgid "Can't load the image."
 msgstr "Impossibile caricare l'immagine."
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Il file %s non esiste."
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Specificare il file mbox da importare e la cartella di destinazione."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Ricerca in %s ..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Importa"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Analisi della cartella %s..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Si è verificato un errore durante l'invio dell'articolo\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Importa"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Specificare il file mbox da importare e la cartella di destinazione."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Directory di origine:"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Directory di destinazione:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nuova cartella"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Specificare il file mbox da importare e la cartella di destinazione."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Selezione del file da importare"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Selezione del file da importare"
 
@@ -2780,142 +2776,142 @@ msgstr "Importazione del file LDIF nella rubrica"
 msgid "Attributes"
 msgstr "Attibuti"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nuovi messaggi"
 
-#: src/inc.c:477
+#: src/inc.c:478
 msgid "Authenticating with POP3"
 msgstr "Autenticazione con POP3"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Recupero i nuovi messaggi"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "Attesa"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Cancellato"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Recupero"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Fatto (ricevuti %d messaggio(i) (%s))"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Non esistono messaggi nuovi."
 
-#: src/inc.c:708
+#: src/inc.c:715
 #, fuzzy
 msgid "Done"
 msgstr "Fatto."
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Connessione fallita"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Autenticazione fallita"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Bloccato"
 
-#: src/inc.c:730
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Timeout"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finito (%d nuovo(i) messaggio(i))"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Finito (non ci sono nuovi messaggi)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "Ci sono stati degli errori durante la ricezione della posta."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "ricezione dei nuovi messaggi dell'account %s...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: autenticazione con POP3"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recupero i nuovi messaggi"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Connessione al server POP3: %s..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossibile connettersi al server POP3: %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Autenticazione..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Ricezione dei messaggi da %s..."
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Ricezione del numero dei nuovi messaggi (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Ricezione del numero dei nuovi messaggi (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Ricezione del numero dei nuovi messaggi (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Ricezione della dimensione dei messaggi (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "Eliminazione del messaggio %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Esco"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recupero il messaggio (%d di %d) (%s di %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2923,15 +2919,15 @@ msgstr ""
 "L'esecuzione del comando del filtro spazzatura è fallita.\n"
 "Controllare l'impostazione del controllo della mail spazzatura."
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 msgid "Connection failed."
 msgstr "Connessione fallita."
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "Si è verificato un errore durante l'elaborazione della posta."
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2940,29 +2936,29 @@ msgstr ""
 "Si è verificato un errore durante l'elaborazione della posta:\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Spazio su disco esaurito."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "Impossibile scrivere il file."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "Errore del socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Connessione chiusa dall'host remoto."
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "La casella postale è bloccata."
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2971,11 +2967,11 @@ msgstr ""
 "La casella postale è bloccata:\n"
 "%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Autenticazione fallita."
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2984,15 +2980,15 @@ msgstr ""
 "Autenticazione fallita:\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "La sessione è andata in timeout."
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "Incorporazione cancellata\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Ricezione in %s dei nuovi messaggi da %s...\n"
@@ -3006,24 +3002,20 @@ msgstr "Inserire la password di %s su %s:"
 msgid "Input password"
 msgstr "Inserire la password"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Log del protocollo"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread non è supportato da glib.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPZIONE]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [indirizzo]  apre una finestra di composizione"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3033,23 +3025,23 @@ msgstr ""
 "                         apre la finestra di composizione con allegati\n"
 "                         i file specificati"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              riceve i nuovi messaggi"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          riceve i nuovi messaggi di tutti gli account"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 invia tutti i messaggi accodati"
 
-#: src/main.c:542
+#: src/main.c:554
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [cartella]... mostra il numero totale dei messaggi"
 
-#: src/main.c:543
+#: src/main.c:555
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3057,47 +3049,47 @@ msgstr ""
 "  --status-full [cartella]...\n"
 "                         mostra lo stato di ogni cartella"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open folderid/msgnum apre il messaggio in una nuova finestra"
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir dirname    specifica la directory che contiene i file di "
 "configurazione"
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "  --ipcport portnum      specifca la porta per i comandi IPC da remoto"
 
-#: src/main.c:550
+#: src/main.c:562
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 esce da Sylpheed"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                modalità di debug"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 mostra questo aiuto ed esce"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              mostra informazioni sulla versione ed esce"
 
-#: src/main.c:557
+#: src/main.c:569
 #, c-format
 msgid "Press any key..."
 msgstr "Premere un tasto qualsiasi..."
 
-#: src/main.c:638
+#: src/main.c:694
 msgid "Filename encoding"
 msgstr "Codifica nome file"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3121,19 +3113,19 @@ msgstr ""
 "\n"
 "Continuo?"
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "C'è un messaggio in composizione. Uscire?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Messaggi accodati"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Ci sono messaggi non spediti in «Coda». Uscire ora ?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3141,16 +3133,20 @@ msgstr ""
 "GnuPG non è installato correttamente, o questa versione è troppo vecchia.\n"
 "Il supporto per OpenPGP è disabilitato."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "un altro Sylpheed è già in esecuzione.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 msgid "Migration of configuration"
 msgstr "Migrazione della configurazione"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3801,8 +3797,8 @@ msgstr "Creazione della finestra principale...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "FinestraPrincipale: l'allocazione del colore %d è fallita.\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "fatto.\n"
 
@@ -4061,7 +4057,7 @@ msgstr "Allegati"
 msgid "Message View - Sylpheed"
 msgstr "Vista messaggio - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossibile salvare il file «%s»."
@@ -6127,19 +6123,19 @@ msgstr "Allegato"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Oggetto"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Da"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Data"
 
@@ -6149,7 +6145,7 @@ msgid "Number"
 msgstr "Numero"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 msgid "To"
 msgstr "A"
 
@@ -6437,29 +6433,29 @@ msgstr "trovati %d messaggi.\n"
 msgid "%d messages found."
 msgstr "trovati %d messaggi.\n"
 
-#: src/query_search.c:579
-#, c-format
-msgid "Searching %s ..."
-msgstr "Ricerca in %s ..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Ricerca in %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, c-format
+msgid "Searching %s ..."
+msgstr "Ricerca in %s ..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Nessuna Data)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 msgid "Save as search folder"
 msgstr "Salva come cartella ricerca"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr "Posizione:"
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 msgid "Folder name:"
 msgstr "Nome della cartella:"
 
@@ -6505,7 +6501,7 @@ msgstr "\t\taka \"%s\"\n"
 msgid "Signature made at %s\n"
 msgstr "Firma fatta a %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Errore verificando la firma"
 
@@ -6534,7 +6530,7 @@ msgstr "Informazioni"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Rimuovi la casella postale"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "No."
 
@@ -6560,58 +6556,58 @@ msgid ""
 "%s"
 msgstr "si è verificato un errore durante la sessione POP3\n"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Ricezione intestazioni del messaggio (%d / %d)"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Ricezione del numero dei nuovi messaggi (STAT)..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 #, fuzzy
 msgid "No message"
 msgstr "Non esistono messaggi nuovi."
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Elimina il(i) messaggio(i)"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Esco..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Recupero i nuovi messaggi"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Invia il messaggio"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Recupero i nuovi messaggi"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Ricezione dei messaggi da %s..."
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 #, fuzzy
 msgid "Delete messages"
 msgstr "Elimina il(i) messaggio(i)"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6692,66 +6688,66 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Connessione al server SMTP: %s..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Si è verificato un errore dopo il comando ESCI (ignorato)"
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "Invio di HELO..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "Autenticazione"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 msgid "Sending message..."
 msgstr "Invio del messaggio..."
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "Invio di EHLO..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Invio di MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Invio"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Invio di RCPT TO..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Invio di DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Invio del messaggio (%d di %d byte)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr ""
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Invio del messaggio"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "Si è verificato un errore durante l'invio del messaggio."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6760,12 +6756,12 @@ msgstr ""
 "Si è verificato un errore durante l'invio del messaggio:\n"
 "%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 #, fuzzy
 msgid "Can't connect to SMTP server."
 msgstr "Impossibile connettersi al server NNTP: %s:%d\n"
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, fuzzy, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Impossibile connettersi al server NNTP: %s:%d\n"
@@ -6790,70 +6786,70 @@ msgstr "Risultato del controllo della firma"
 msgid "Checking signature"
 msgstr "Controllo della firma"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s da «%s»"
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Firma non trovata"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma valida da «%s»"
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Firma corretta"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Firma valida, ma la chiave per «%s» non è fidata"
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Firma valida (chiave non fidata)"
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr "Firma valida per «%s», ma scaduta"
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 msgid "Signature valid but expired"
 msgstr "Firma valida ma scaduta"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr "Firma valida, ma la firma della chiave per «%s» è scaduta"
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr "Firma valida, ma la firma della chiave è scaduta"
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr "Firma valida, ma la firma della chiave per «%s» è stata revocata"
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr "Firma valida, ma la firma della chiave è stata revocata"
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma DIFETTOSA da «%s»"
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "Firma DIFETTOSA"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "Nessuna chiave pubblica per verificare la firma"
 
@@ -6958,7 +6954,7 @@ msgstr "Recupero la lista dei newsgroup..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Impossibile recuperare la lista dei newsgroup."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Fatto."
 
@@ -7085,221 +7081,221 @@ msgstr "Sono rimaste alcune operazioni segnate. Le elaboro?"
 msgid "Scanning folder (%s)..."
 msgstr "Esame della cartella (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 msgid "_Search again"
 msgstr "_Ricerca ancora"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Non esistono più messaggi non letti"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio non letto. Ricerco dalla fine?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Non esistono messaggi non letti."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Non è stato trovato nessun messaggio non letto. Passo alla cartella seguente?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Non esistono più messaggi nuovi"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio nuovo. Ricerco dalla fine?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Non esistono messaggi nuovi."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr ""
 "Non è stato trovato nessun messaggio nuovo. Passo alla cartella seguente?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Non esistono più messaggi segnati"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio segnato. Ricerco dalla fine?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Non esistono messaggi segnati."
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "Non è stato trovato nessun messaggio segnato. Ricerco dall'inizio?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Non esistono più messaggi etichettati"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio etichettato. Ricerco dalla fine?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Non esistono messaggi etichettati."
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Non è stato trovato nessun messaggio etichettato. Ricerco dall'inizio?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Raggruppamento dei messaggi per oggetto..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d eliminato"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d spostato"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiato"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " voci selezionate"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuovi, %d non letti, %d totale (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nuovi, %d non letti, %d totale"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Ordinamento del sommario..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tImpostazione del sommario dai dati dei messaggi..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Impostazione del sommario dai dati dei messaggi..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Scrittura della cache del sommario (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Il messaggio %d è segnato\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Il messaggio %d è segnato come già letto\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Il messaggio %d è segnato come non letto\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Il messaggio %s/%d è impostato per l'eliminazione\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Elimina il(i) messaggio(i)"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Eliminare il(i) messaggio(i) dal cestino?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Eliminazione dei messaggi duplicati..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Il messaggio %s/%d non è segnato\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Il messaggio %d è impostato per lo spostamento in %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "La destinazione coincide con la cartella attuale."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Selezione della cartella"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Il messaggio %d è impostato per la copia in %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 msgid "Destination for copy is same as current folder."
 msgstr "La destinazione della copia coincide con la cartella attuale."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Selezione della cartella"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 msgid "Error occurred while processing messages."
 msgstr "Si è verificato un errore durante l'elaborazione dei messaggi."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Costruzione dei thread..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Senza thread..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtraggio (%d / %d)..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "filtraggio..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Filtraggio..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sono stati filtrati %d messaggi(o)."
@@ -7390,35 +7386,41 @@ msgstr "Invia i me_ssaggi accodati"
 msgid "E_xit"
 msgstr "_Esci"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "Firma non trovata"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "Informazioni sui server"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "un altro Sylpheed è già in esecuzione.\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "impossibile aprire il file delle segnature.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "g_thread non è supportato da glib.\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "File da importare:"
 
diff --git a/po/ja.po b/po/ja.po
index aae470f4..dd65f670 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: 2009-10-05 15:41+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+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"
@@ -36,176 +36,176 @@ msgstr "%s:%d へのIMAP4の接続を確立中...\n"
 msgid "Can't start TLS session.\n"
 msgstr "TLS セッションを開始できません。\n"
 
-#: libsylph/imap.c:1221
+#: libsylph/imap.c:1230
 #, c-format
-msgid "Getting message %d"
-msgstr "メッセージ %d を取得中"
+msgid "Getting message %u"
+msgstr "メッセージ %u を取得中"
 
-#: libsylph/imap.c:1337
+#: libsylph/imap.c:1346
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "メッセージを %s に追加しています (%d / %d)"
 
-#: libsylph/imap.c:1460
+#: libsylph/imap.c:1469
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "メッセージ %s を %s に移動しています..."
 
-#: libsylph/imap.c:1465
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "メッセージ %s を %s にコピーしています..."
 
-#: libsylph/imap.c:1603
+#: libsylph/imap.c:1612
 #, c-format
 msgid "Removing messages %s"
 msgstr "メッセージ %s を削除しています"
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1618
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "deleted フラグをセットできません: %s\n"
 
-#: libsylph/imap.c:1617 libsylph/imap.c:1712
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "expunge できません\n"
 
-#: libsylph/imap.c:1700
+#: libsylph/imap.c:1709
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "%s のすべてのメッセージを削除しています"
 
-#: libsylph/imap.c:1706
+#: libsylph/imap.c:1715
 msgid "can't set deleted flags: 1:*\n"
 msgstr "deleted フラグをセットできません: 1:*\n"
 
-#: libsylph/imap.c:1754
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "フォルダをクローズできません\n"
 
-#: libsylph/imap.c:1833
+#: libsylph/imap.c:1842
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "ルートフォルダ %s が存在しません\n"
 
-#: libsylph/imap.c:2033 libsylph/imap.c:2041
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "LIST の取得中にエラーが発生しました。\n"
 
-#: libsylph/imap.c:2272
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "'%s' を作成できません。\n"
 
-#: libsylph/imap.c:2277
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "INBOX の下に '%s' を作成できません。\n"
 
-#: libsylph/imap.c:2339
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "メールボックスを作成できません: LIST に失敗\n"
 
-#: libsylph/imap.c:2362
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "メールボックスを作成できません\n"
 
-#: libsylph/imap.c:2490
+#: libsylph/imap.c:2499
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "メールボックスを名称変更できません: %s -> %s\n"
 
-#: libsylph/imap.c:2570
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "メールボックスを削除できません\n"
 
-#: libsylph/imap.c:2599
+#: libsylph/imap.c:2608
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "メッセージのヘッダを取得中 (%d / %d)"
 
-#: libsylph/imap.c:2633
+#: libsylph/imap.c:2642
 msgid "can't get envelope\n"
 msgstr "エンベロープを取得できません\n"
 
-#: libsylph/imap.c:2660
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "エンベロープを取得中にエラーが発生しました。\n"
 
-#: libsylph/imap.c:2681
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "エンベロープを解析できません: %s\n"
 
-#: libsylph/imap.c:2838 libsylph/imap.c:2844
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4 サーバ: %s:%d に接続できません\n"
 
-#: libsylph/imap.c:2852
+#: libsylph/imap.c:2863
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "%s:%d との IMAP4 セッションを確立できません\n"
 
-#: libsylph/imap.c:2927
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "namespace を取得できません\n"
 
-#: libsylph/imap.c:3460
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "フォルダ %s を選択できません\n"
 
-#: libsylph/imap.c:3495
+#: libsylph/imap.c:3506
 msgid "error on imap command: STATUS\n"
 msgstr "imap コマンド中のエラー: STATUS\n"
 
-#: libsylph/imap.c:3618 libsylph/imap.c:3653
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 の認証に失敗しました。\n"
 
-#: libsylph/imap.c:3702
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4のログインに失敗しました。\n"
 
-#: libsylph/imap.c:4067
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s を %s に追加できません\n"
 
-#: libsylph/imap.c:4074
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(ファイルを送信中...)"
 
-#: libsylph/imap.c:4103
+#: libsylph/imap.c:4114
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "メッセージを %s に追加できません\n"
 
-#: libsylph/imap.c:4135
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s を %s にコピーできません\n"
 
-#: libsylph/imap.c:4159
+#: libsylph/imap.c:4170
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap コマンド中のエラー: STORE %s %s\n"
 
-#: libsylph/imap.c:4173
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap コマンド中のエラー: EXPUNGE\n"
 
-#: libsylph/imap.c:4186
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "imap コマンド中のエラー: CLOSE\n"
 
-#: libsylph/imap.c:4485
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv が UTF-7 を %s に変換できません\n"
 
-#: libsylph/imap.c:4515
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv が %s を UTF-7 に変換できません\n"
@@ -287,21 +287,21 @@ msgstr "メールボックスをゼロに切り詰められません。\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "メッセージを %s から %s に書き出しています...\n"
 
-#: libsylph/mh.c:486
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "メッセージ %s を %s にコピーできません\n"
 
-#: libsylph/mh.c:670 libsylph/mh.c:785
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "移動元フォルダが移動先と同一です。\n"
 
-#: libsylph/mh.c:788
+#: libsylph/mh.c:824
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "メッセージ %s/%d を %s にコピーしています...\n"
 
-#: libsylph/mh.c:1128 libsylph/mh.c:1141 src/main.c:180
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -310,7 +310,7 @@ msgstr ""
 "ファイル `%s' がすでに存在します。\n"
 "フォルダを作成できません。"
 
-#: libsylph/mh.c:1686
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -339,67 +339,67 @@ msgstr "%s:%d への NNTP の接続を確立中...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "%s:%d への NNTP の接続が切れています。再接続します...\n"
 
-#: libsylph/news.c:386
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "%d 番の記事はすでにキャッシュされています。\n"
 
-#: libsylph/news.c:406
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "%d 番の記事を取得しています...\n"
 
-#: libsylph/news.c:410
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "%d 番の記事を読めません\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "記事をポストできません。\n"
 
-#: libsylph/news.c:711
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "%d 番の記事を取得できません\n"
 
-#: libsylph/news.c:768
+#: libsylph/news.c:770
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "グループを選択できません: %s\n"
 
-#: libsylph/news.c:805
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "無効な記事の範囲です: %d - %d\n"
 
-#: libsylph/news.c:818
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "新着記事はありません。\n"
 
-#: libsylph/news.c:828
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "xover %d - %d を取得中 (%s)...\n"
 
-#: libsylph/news.c:832
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "xover 情報を取得できません\n"
 
-#: libsylph/news.c:842
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "xover 情報を取得中にエラーが発生しました。\n"
 
-#: libsylph/news.c:852
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "無効な xover 行です: %s\n"
 
-#: libsylph/news.c:871 libsylph/news.c:903
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "xhdr 情報を取得できません\n"
 
-#: libsylph/news.c:883 libsylph/news.c:915
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "xhdr 情報を取得中にエラーが発生しました。\n"
 
@@ -446,37 +446,37 @@ msgstr "POP3 プロトコルエラー\n"
 msgid "invalid UIDL response: %s\n"
 msgstr "無効な UIDL 応答です: %s\n"
 
-#: libsylph/pop.c:652
+#: libsylph/pop.c:647
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: 期限切れのメッセージ %d を削除します\n"
 
-#: libsylph/pop.c:661
+#: libsylph/pop.c:656
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: メッセージ %d をスキップします (%d bytes)\n"
 
-#: libsylph/pop.c:695
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "メールボックスはロックされています\n"
 
-#: libsylph/pop.c:698
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "セッションがタイムアウトしました\n"
 
-#: libsylph/pop.c:704 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "TLS セッションを開始できません\n"
 
-#: libsylph/pop.c:711 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "認証中にエラーが発生しました\n"
 
-#: libsylph/pop.c:716
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "コマンドがサポートされていません\n"
 
-#: libsylph/pop.c:720
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "POP3 セッション中にエラーが発生しました\n"
 
@@ -511,12 +511,12 @@ msgstr "procmime_get_text_content(): コード変換に失敗しました。\n"
 msgid "can't open mark file\n"
 msgstr "マークファイルを開けません\n"
 
-#: libsylph/procmsg.c:1332
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "メッセージ %d を取り込めません\n"
 
-#: libsylph/procmsg.c:1571
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "印刷のコマンドラインが無効です: `%s'\n"
@@ -672,7 +672,7 @@ msgstr ""
 "新着メッセージはこの順番でチェックされます。「全受信」によるメッセージ\n"
 "の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -813,7 +813,7 @@ msgstr "アドレスをアドレス帳に追加"
 msgid "Address"
 msgstr "アドレス"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "備考"
@@ -822,28 +822,28 @@ msgstr "備考"
 msgid "Select Address Book Folder"
 msgstr "アドレス帳フォルダを選択"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/ファイル(_F)"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/ファイル(_F)/新規アドレス帳(_B)"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/ファイル(_F)/新規_vCard"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/ファイル(_F)/新規_JPilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 msgid "/_File/New _LDAP Server"
 msgstr "/ファイル(_F)/新規LDAPサーバ(_L)"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -851,100 +851,100 @@ msgstr "/ファイル(_F)/新規LDAPサーバ(_L)"
 msgid "/_File/---"
 msgstr "/ファイル(_F)/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/ファイル(_F)/編集(_E)"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/ファイル(_F)/削除(_D)"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/ファイル(_F)/保存(_S)"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/ファイル(_F)/閉じる(_C)"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/編集(_E)"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/編集(_E)/コピー(_C)"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/編集(_E)/ペースト(_P)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/アドレス(_A)"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/アドレス(_A)/新規アドレス(_A)"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/アドレス(_A)/新規グループ(_G)"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/アドレス(_A)/新規フォルダ(_F)"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/アドレス(_A)/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/アドレス(_A)/編集(_E)"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/アドレス(_A)/削除(_D)"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/ツール(_T)"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/ツール(_T)/_LDIFファイルをインポート"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 msgid "/_Tools/Import _CSV file"
 msgstr "/ツール(_T)/_CSVファイルをインポート"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/ヘルプ(_H)/このプログラムについて(_A)"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/新規アドレス(_A)"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/新規グループ(_G)"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/新規フォルダ(_F)"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -957,79 +957,85 @@ msgstr "/新規フォルダ(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/削除(_D)"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 msgid "/_Copy"
 msgstr "/コピー(_C)"
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 msgid "/_Paste"
 msgstr "/ペースト(_P)"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "電子メール アドレス"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "アドレス帳"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "フォルダ"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "電子メール アドレス"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "名前:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "宛先:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "削除"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "追加"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "検索"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 msgid "_Close"
 msgstr "閉じる(_C)"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "アドレスの削除"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "本当にこのアドレスを削除しますか?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1038,36 +1044,36 @@ msgstr ""
 "`%s' 内のすべてのフォルダとアドレスを削除してもいいですか?\n"
 "フォルダのみを削除する場合、アドレスは親フォルダに移動します。"
 
-#: src/addressbook.c:1643 src/folderview.c:2544
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "フォルダの削除"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "_Folder only"
 msgstr "フォルダのみ(_F)"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "Folder and _addresses"
 msgstr "フォルダとアドレス(_A)"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "本当に `%s' を削除しますか?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "新規ユーザ、インデックスファイルを保存できません。"
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "新規ユーザ、アドレス帳ファイルを保存できません。"
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "旧形式のアドレス帳は正しく変換されました。"
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1075,7 +1081,7 @@ msgstr ""
 "旧形式のアドレス帳は変換されました。\n"
 "新規アドレスインデックスファイルに保存できません"
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1083,7 +1089,7 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "しかし空の新規アドレス帳ファイルが作成されました。"
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1091,7 +1097,7 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "新規アドレス帳ファイルを作成できません。"
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1099,90 +1105,84 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "新規アドレス帳ファイルを作成できません。"
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 msgid "Address book conversion error"
 msgstr "アドレス帳の変換エラー"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 msgid "Address book conversion"
 msgstr "アドレス帳の変換"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 msgid "Address Book Error"
 msgstr "アドレス帳のエラー"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "アドレスインデックスを読み込めません"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "旧形式のアドレス帳は変換されましたが、新規アドレスインデックスファイルを保存"
 "できません"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "アドレス帳を変換できませんでしたが、空の新規アドレス帳ファイルが作成されまし"
 "た。"
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "アドレス帳を変換できません。新規アドレス帳ファイルを作成できませんでした。"
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "アドレス帳を変換できません。新規アドレス帳ファイルを作成できませんでした。"
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 msgid "Address Book Conversion Error"
 msgstr "アドレス帳変換エラー"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 msgid "Address Book Conversion"
 msgstr "アドレス帳変換"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "インタフェース"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "アドレス帳"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "人物"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "グループ"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "フォルダ"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "LDAPサーバ"
 
@@ -1576,7 +1576,7 @@ msgstr "メッセージ: %s"
 msgid "Can't get the part of multipart message."
 msgstr "マルチパートメッセージのパートを取得できません。"
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
 #: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(件名なし)"
@@ -2248,7 +2248,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "フォルダ名に `%c' を含むことはできません。"
 
 #: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
-#: src/query_search.c:1052
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "フォルダ `%s' はすでに存在します。"
@@ -2518,7 +2518,7 @@ msgstr "ニュースグループ:"
 msgid "Creating header view...\n"
 msgstr "ヘッダビューを作成中...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:668
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
 #: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(差出人不明)"
@@ -2833,7 +2833,7 @@ msgstr "POP3サーバ: %s に接続中..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3サーバ: %s:%d に接続できません\n"
 
-#: src/inc.c:938 src/rpop3.c:824 src/send_message.c:817
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "認証中..."
@@ -2873,7 +2873,7 @@ msgstr "切断中"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "メッセージを受信中 (%d / %d) (%s / %s)"
 
-#: src/inc.c:1234 src/inc.c:1257 src/summaryview.c:4535
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2881,15 +2881,15 @@ msgstr ""
 "迷惑メールフィルタコマンドの実行に失敗しました。\n"
 "迷惑メール対策の設定を確認してください。"
 
-#: src/inc.c:1317
+#: src/inc.c:1318
 msgid "Connection failed."
 msgstr "接続に失敗しました。"
 
-#: src/inc.c:1323
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "メールの処理中にエラーが発生しました。"
 
-#: src/inc.c:1328
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2898,29 +2898,29 @@ msgstr ""
 "メールの処理中にエラーが発生しました:\n"
 "%s"
 
-#: src/inc.c:1334
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "ディスクの空き容量がありません。"
 
-#: src/inc.c:1339
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "ファイルに書き込めません。"
 
-#: src/inc.c:1344
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "ソケットエラーです。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1350 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "リモートホストによって接続を切断されました。"
 
-#: src/inc.c:1356
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "メールボックスはロックされています。"
 
-#: src/inc.c:1360
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2929,11 +2929,11 @@ msgstr ""
 "メールボックスはロックされています:\n"
 "%s"
 
-#: src/inc.c:1366 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "認証に失敗しました。"
 
-#: src/inc.c:1371 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2942,15 +2942,15 @@ msgstr ""
 "認証に失敗しました:\n"
 "%s"
 
-#: src/inc.c:1376 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "セッションがタイムアウトしました。"
 
-#: src/inc.c:1417
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "受信をキャンセルしました\n"
 
-#: src/inc.c:1519
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "新しいメッセージを %s から %s に取り込んでいます...\n"
@@ -3097,15 +3097,15 @@ msgid "Loading plug-ins..."
 msgstr "プラグインをロード中..."
 
 #. remote command mode
-#: src/main.c:1191
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "別の Sylpheed がすでに起動しています。\n"
 
-#: src/main.c:1461
+#: src/main.c:1464
 msgid "Migration of configuration"
 msgstr "設定の移行"
 
-#: src/main.c:1462
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -6360,29 +6360,29 @@ msgstr "1 通のメッセージが見つかりました。"
 msgid "%d messages found."
 msgstr "%d 通のメッセージが見つかりました。"
 
-#: src/query_search.c:579
-#, c-format
-msgid "Searching %s ..."
-msgstr "%s を検索中..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "%s を検索中 (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:676 src/summaryview.c:2225
+#: src/query_search.c:709
+#, c-format
+msgid "Searching %s ..."
+msgstr "%s を検索中..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(日付なし)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 msgid "Save as search folder"
 msgstr "検索フォルダとして保存"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr "場所:"
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 msgid "Folder name:"
 msgstr "フォルダ名:"
 
@@ -6485,50 +6485,50 @@ msgstr ""
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "メッセージのヘッダを取得中 (%d / %d) ..."
 
-#: src/rpop3.c:850
+#: src/rpop3.c:853
 msgid "Getting the number of messages..."
 msgstr "メッセージの件数を取得中..."
 
-#: src/rpop3.c:859 src/rpop3.c:872
+#: src/rpop3.c:862 src/rpop3.c:875
 msgid "No message"
 msgstr "メッセージがありません"
 
-#: src/rpop3.c:905
+#: src/rpop3.c:908
 #, c-format
 msgid "Deleted %d messages"
 msgstr "%d 通のメッセージを削除しました"
 
-#: src/rpop3.c:943 src/rpop3.c:955 src/rpop3.c:1005 src/rpop3.c:1200
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
 #: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "切断中..."
 
-#: src/rpop3.c:990
+#: src/rpop3.c:1006
 #, c-format
 msgid "Retrieved %d messages"
 msgstr "%d 通のメッセージを取得しました"
 
-#: src/rpop3.c:997
+#: src/rpop3.c:1013
 #, c-format
 msgid "Opened message %d"
 msgstr "メッセージ %d を開きました"
 
-#: src/rpop3.c:1013
+#: src/rpop3.c:1029
 #, c-format
 msgid "Retrieved %d message headers"
 msgstr "%d 件のメッセージのヘッダを取得しました"
 
-#: src/rpop3.c:1126
+#: src/rpop3.c:1145
 #, c-format
 msgid "Retrieving message %d ..."
 msgstr "メッセージ %d を取得中..."
 
-#: src/rpop3.c:1152
+#: src/rpop3.c:1171
 msgid "Delete messages"
 msgstr "メッセージの削除"
 
-#: src/rpop3.c:1153
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -7306,7 +7306,7 @@ msgstr "終了(_X)"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
@@ -7314,18 +7314,18 @@ msgstr ""
 "新しいバージョンのSylpheedが見つかりました。\n"
 "今すぐ更新しますか?"
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 msgid "New version found"
 msgstr "新しいバージョンが見つかりました"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 msgid "Information"
 msgstr "情報"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 msgid "Sylpheed is already the latest version."
 msgstr "Sylpheed はすでに最新バージョンです。"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr "バージョン情報を取得できませんでした。"
diff --git a/po/ko.po b/po/ko.po
index 3c684303..646a34ee 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: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+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,233 +18,233 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "각 계정에대한 모든 설정을 읽습니다...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "%s:%d에대한 IMAP4 접속이 끊어졌습니다. 다시 접속...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP 서버 디렉토리"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "%s:%d에대한 IMAP4 접속을 만듭니다 ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "TLS 세션을 시작할 수 없습니다.\n"
 
-#: libsylph/imap.c:1176
+#: libsylph/imap.c:1230
 #, fuzzy, c-format
-msgid "Getting message %d"
+msgid "Getting message %u"
 msgstr "%d 메시지를 삭제하는 중"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "메시지를 보내는 중 (%d / %d 바이트)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "메시지 %s%c%d를 %s로 이동합니다...\n"
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "메시지 %s%c%d를 %s로 복사중입니다 ...\n"
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "삭제 플래그를 설정할 수가 없습니다: %d\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "지울 수가 없습니다\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "삭제 플래그를 설정할 수가 없습니다: 1:%d\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "폴더를 선택할 수가 없습니다: %s\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "표시 파일이 발견되지않음.\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "LIST를 얻는 도중 에러가 발생.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "'%s'를 생성할 수가 없습니다\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "INBOX 아래에 '%s'를 생성할 수가 없습니다\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "우편함을 생성할 수 없습니다: LIST 실패\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "우편함을 생성할 수 없습니다\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "우편함명을 바꿀 수 없습니다: %s에서 %s로\n"
 
-#: libsylph/imap.c:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "우편함을 삭제할 수 없습니다\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "envelope를 얻을 수가 없습니다\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "메시지를 보내는 중 (%d / %d 바이트)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "envelope를 얻을 수가 없습니다\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "envelope를 얻는 중 에러 발생.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "envelope를 파싱할 수가 없습니다: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "%s:%d IMAP4 서버에 연결할 수가 없습니다\n"
 
-#: libsylph/imap.c:2714
+#: libsylph/imap.c:2863
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "IMAP4 세션을 만들 수 없습니다: %s: %d\n"
 
-#: libsylph/imap.c:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "namespace를 얻을 수 없습니다\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "폴더를 선택할 수가 없습니다: %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "인증 방법"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 로그인을 실패했습니다.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s를 %s에 붙일 수 없습니다\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(파일을 보냅니다...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "%s 메시지를 추가할 수가 없습니다\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%d를 %s로 복사할 수가 없습니다\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap 명령어 실행중 에러: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv가 UTF-7를 %s로 변환할 수 없습니다\n"
 
-#: libsylph/imap.c:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv가 %s를 UTF-7로 변환할 수 없습니다\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "임시 파일에 쓸 수가 없습니다\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "mbox 파일을 읽을 수가 없습니다.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "올바르지않은 mbox 포멧: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "제대로되어있지않은 mbox: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "임시파일을 열 수가 없습니다\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -253,66 +253,62 @@ msgstr ""
 "메시지 본문중 From으로 시작하는 줄이 있습니다:\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "잠금 파일 %s을 만들수가 없습니다\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "가능하면 'file'대신에 'flock'를 사용하세요.\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "%s를 생성할 수가 없습니다\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "메일박스를 다른 프로세스가 읽고있습니다. 잠시 기다리세요...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "%s에 lock를 걸수가 없습니다\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "올바르지않은 잠금 타입\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "%s에 lock를 풀 수가 없습니다\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "메일박스의 크기를 0으로 만들수가 없습니다.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "메시지를 %s에서 %s로 보냅니다...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "메시지 %s을 %s로 복사할 수가 없습니다\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "표시 파일을 열 수가 없습니다.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "옮길 폴더와 옮겨질 폴더가 같습니다.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "메시지 %s%c%d를 %s로 복사중입니다 ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -321,7 +317,7 @@ msgstr ""
 "파일 `%s'가 이미 존재합니다.\n"
 "폴더를 생성할 수가 없습니다."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -333,77 +329,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "%s:%d로 NNTP 접속을 생성합니다...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "%s:%d로의 NNTP 연결이 끊어졌습니다. 다시 연결합니다...\n"
 
-#: libsylph/news.c:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "기사 %d는 이미 캐쉬되었습니다.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "기사 %d를 얻습니다...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "기사 %d를 읽을 수가 없습니다\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "기사를 올릴 수가 없습니다.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "기사 %d를 가져올 수가 없습니다\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "%s 그룹을 선택할 수가 없습니다\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "올바르지않은 기사 범위: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "새 기사가 없습니다.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "%3$s에서 %1$d - %2$d xover를 가져옴...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "xover를 가져올 수가 없습니다\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "xover를 얻는 도중 에러가 발생.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "올바르지않은 xover line: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "xhdr을 가져올 수가 없습니다\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "xhdr을 얻는 도중 에러가 발생.\n"
 
@@ -462,28 +458,28 @@ msgstr "POP3: 만료된 메시지 %d를 삭제합니다\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: 메시지 %d를 건너뜁니다 (%d 바이트)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "우편함이 잠겨있습니다\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr ""
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "TLS 세션을 시작할 수 없습니다\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "인증 도중 에러 발생\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 #, fuzzy
 msgid "command not supported\n"
 msgstr "명령어"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "인증 도중 에러 발생\n"
@@ -517,16 +513,16 @@ msgstr "폴더"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): 코드 변환이 실패했습니다.\n"
 
-#: libsylph/procmsg.c:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "표시 파일을 열수가 없습니다\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "메시지 %d를 가져올 수가 없습니다\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "인쇄 명령어가 올바르지않습니다: `%s'\n"
@@ -670,7 +666,7 @@ msgstr ""
 "새 메시지는 이 순서대로 확인될 것입니다. `모두 받기'로 메시지를\n"
 "받으려면 `G' 컬럼 상자를 선택하세요."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -811,7 +807,7 @@ msgstr "주소록에 추가"
 msgid "Address"
 msgstr "주소"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "메모"
@@ -820,29 +816,29 @@ msgstr "메모"
 msgid "Select Address Book Folder"
 msgstr "주소록 폴더 선택"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/파일(_F)"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/파일(_F)/새 주소록(_B)"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/파일(_F)/새 vCard(_v)"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/파일(_F)/새 JPilot(_J)"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/파일(_F)/새 서버(_S)"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -850,101 +846,101 @@ msgstr "/파일(_F)/새 서버(_S)"
 msgid "/_File/---"
 msgstr "/파일(_F)/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/파일(_F)/편집(_E)"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/파일(_F)/삭제(_D)"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/파일(_F)/닫기(_C)"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/편집(_E)"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/편집(_E)/붙여넣기(_P)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/주소(_A)"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/주소(_A)/새 주소(_A)"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/주소(_A)/새 그룹(_G)"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/주소(_A)/새 폴더(_F)"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/주소(_A)/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/주소(_A)/편집(_E)"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/주소(_A)/삭제(_D)"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/도구(_T)"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/도움말(_H)/sylpheed 정보(_A)"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/새 주소(_A)"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/새 그룹(_G)"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/새 폴더(_F)"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -957,82 +953,88 @@ msgstr "/새 폴더(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/삭제(_D)"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 #, fuzzy
 msgid "/_Copy"
 msgstr "/복사(_C)..."
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 #, fuzzy
 msgid "/_Paste"
 msgstr "/편집(_E)/붙여넣기(_P)"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "이메일 주소"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "주소록"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "폴더"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "이메일 주소"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "이름:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "받는 사람:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "참조:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "숨은 참조:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "삭제"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "추가"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "찾기"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 #, fuzzy
 msgid "_Close"
 msgstr "닫기"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "주소를 삭제"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "정말로 주소를 삭제하시겠습니까?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1041,38 +1043,38 @@ msgstr ""
 "`%s'의 모든 주소와 폴더를 삭제할까요 ? \n"
 "폴더만 지울 경우 주소는 그 상위 폴더로 옮겨집니다."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "폴더 삭제"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 #, fuzzy
 msgid "_Folder only"
 msgstr "폴더만"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "폴더와 주소"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "정말로 `%s'를 지우시겠습니까?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "새 사용자, 색인 파일을 저장할 수 없습니다."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "새 사용자, 주소록 파일을 저장할 수 없습니다."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "예전 주소록을 성공적으로 변환하였습니다."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1080,7 +1082,7 @@ msgstr ""
 "예전 주소록이 변환되었습니다,\n"
 "새 주소록의 색인 파일을 저장할 수 없습니다"
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1088,7 +1090,7 @@ msgstr ""
 "주소록을 변환할 수 없습니다,\n"
 "대신에 빈 새 주소록 파일을 생성하였습니다."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1096,7 +1098,7 @@ msgstr ""
 "주소록을 변환하지 못했습니다,\n"
 "새 주소록 파일을 생성하지 못했습니다."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1104,90 +1106,84 @@ msgstr ""
 "주소록을 변환하지 못했고\n"
 "새 주소록 파일도 생성하지 못했습니다."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 #, fuzzy
 msgid "Address book conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 #, fuzzy
 msgid "Address Book Error"
 msgstr "주소록 에러"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "주소 색인을 읽을 수 없습니다"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr "예전 주소록이 변환되었습니다, 새 주소록 색인 파일을 저장할 수 없습니다"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "주소록을 변환할 수 없습니다, 대신에 빈 새 주소록 파일을 생성하였습니다."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "주소록을 변환하지 못했습니다, 새 주소록 파일을 생성하지 못했습니다."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "주소록을 변환하지 못했고 새 주소록 파일도 생성하지 못했습니다."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "주소록 변환 에러"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "인터페이스"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "주소록"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "사람"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "그룹"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "폴더"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "LDAP 서버"
 
@@ -1199,15 +1195,15 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "알림"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "경고"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "에러"
 
@@ -1250,7 +1246,7 @@ msgstr "갈색"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "없음"
 
@@ -1623,8 +1619,8 @@ msgstr "메시지: %s"
 msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(제목 없음)"
 
@@ -1815,7 +1811,7 @@ msgstr "마임 타입"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "크기"
 
@@ -2064,12 +2060,12 @@ msgstr "폴더 편집"
 msgid "Input the new name of folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "새 폴더"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
@@ -2215,7 +2211,7 @@ msgstr ""
 msgid "Specify source folder and destination file."
 msgstr "대상 mbox 파일과 대상 폴더를 지정하세요."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "날짜 형식"
@@ -2230,7 +2226,7 @@ msgstr "새 폴더"
 msgid "Destination:"
 msgstr "저장 폴더"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2242,7 +2238,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "고르기..."
@@ -2304,23 +2300,23 @@ msgstr "지운 편지함"
 msgid "Drafts"
 msgstr "임시 보관함"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "새 폴더"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c'는 폴더 이름에 포함될 수 없습니다."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' 폴더가 이미 존재합니다."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' 폴더를 생성할 수가 없습니다."
@@ -2452,32 +2448,32 @@ msgstr "모든 폴더의 새로운 메시지를 확인합니다..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s 폴더가 선택되었습니다\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "메시지을 보내는 중"
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "메시지을 보내는 중"
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 #, fuzzy
 msgid "Download all messages"
 msgstr "메시지을 보내는 중"
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2487,26 +2483,26 @@ msgstr ""
 "(만일 하위폴더를 저장하기 위한 폴더를 생성하려면,\n"
 "이름의 마지막에 `/'를 추가하세요)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s'에대한 새 이름을 넣으세요:"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "폴더 이름 변경"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2515,12 +2511,12 @@ msgstr ""
 "`%s' 메일박스를 정말로 삭제하시겠습니까?\n"
 "(메시지가 디스크로부터 삭제되는것은 아닙니다)"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 #, fuzzy
 msgid "Delete search folder"
 msgstr "폴더 삭제"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2531,21 +2527,21 @@ msgstr ""
 "`%s'아래에 있는 모든 폴더와 메시지가 삭제될 것입니다.\n"
 "정말로 삭제하시겠습니까?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "지운 편지함 비우기"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2554,34 +2550,34 @@ msgstr ""
 "`%s' 메일박스를 정말로 삭제하시겠습니까?\n"
 "(메시지가 디스크로부터 삭제되는것은 아닙니다)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "메일박스를 제거합니다"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "정말로 `%s' IMAP4 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 계정 삭제"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "정말로 `%s' 뉴스그룹을 삭제하시겠습니까?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "뉴스그룹 삭제"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "정말로 `%s' 뉴스그룹 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "뉴스그룹 계정 삭제"
 
@@ -2593,8 +2589,8 @@ msgstr "뉴스그룹:"
 msgid "Creating header view...\n"
 msgstr "헤더 뷰를 생성합니다...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(???)"
 
@@ -2606,71 +2602,71 @@ msgstr "이미지 뷰를 생성합니다...\n"
 msgid "Can't load the image."
 msgstr "이미지를 불러올 수가 없습니다."
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "%s파일이 없습니다\n"
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "대상 mbox 파일과 대상 폴더를 지정하세요."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "%s 폴더를 스캔합니다..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "가져오기"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "%s 폴더를 스캔합니다..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "글을 올리는 도중 에러 발생\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "가져오기"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "대상 mbox 파일과 대상 폴더를 지정하세요."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "새 폴더"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "저장할 폴더:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "새 폴더"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "대상 mbox 파일과 대상 폴더를 지정하세요."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "불러올 파일을 선택"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "불러올 파일을 선택"
 
@@ -2831,214 +2827,214 @@ msgstr "LDIF 파일을 주소록으로 가져오기"
 msgid "Attributes"
 msgstr "속성"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "끝났습니다 (%d개의 새로운 메시지)"
 
-#: src/inc.c:477
+#: src/inc.c:478
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "인증"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "새 메시지를 가져옴"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr ""
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "취소되었습니다"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr ""
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "완료 (%d 메시지 (%s)가 받아짐)"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "새 메시지가 없습니다."
 
-#: src/inc.c:708
+#: src/inc.c:715
 #, fuzzy
 msgid "Done"
 msgstr "완료."
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "연결이 실패했습니다"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "인증이 실패했습니다."
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:730
+#: src/inc.c:737
 msgid "Timeout"
 msgstr ""
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "끝났습니다 (%d개의 새로운 메시지)"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "끝났습니다 (새 메시지 없음)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "편지를 받다가 에러가 발생했습니다."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s 계정으로부터 새 메시지를 얻습니다...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "인증"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 새 메시지를 가져옴"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3 서버 %s에 연결합니다..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "%s:%d POP3 서버에 연결할 수가 없습니다\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "인증 중입니다..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "새 메시지의 갯수를 얻는 중 (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "새 메시지의 갯수를 얻는 중 (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "새 메시지의 갯수를 얻는 중 (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "메시지의 크기를 얻는 중 (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d 메시지를 삭제하는 중"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "끝마치는 중"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "메시지 (%d / %d) 를 가져오는 중 (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 #, fuzzy
 msgid "Connection failed."
 msgstr "연결이 실패했습니다"
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "디스크에 남은 공간이 없슴."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "파일에 쓸 수가 없습니다."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "소켓 에러."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "메일박스가 잠겨있습니다."
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "메일박스가 잠겨있습니다."
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 #, fuzzy
 msgid "Authentication failed."
 msgstr "인증 방법"
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "인증 방법"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "병합이 취소되었습니다.\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s로부터 %s로 새 메시지를 가져옴...\n"
@@ -3052,24 +3048,20 @@ msgstr ""
 msgid "Input password"
 msgstr "암호 입력"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "프로토콜 로그"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread가 glib에의해 지원되지않습니다.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "사용법: %s [옵션]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [주소]       편집 창을 엽니다"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3079,71 +3071,71 @@ msgstr ""
 "                         지정된 파일을 첨부해서 편지 작성 창\n"
 "                         attached"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              새 메시지를 받습니다"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          모든 계정에서 새 메시지를 받습니다"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 큐에 있는 모든 메시지를 보냅니다"
 
-#: src/main.c:542
+#: src/main.c:554
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               총 메시지 갯수를 알려줍니다"
 
-#: src/main.c:543
+#: src/main.c:555
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               총 메시지 갯수를 알려줍니다"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:550
+#: src/main.c:562
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                디버깅 모드"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                디버깅 모드"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 이 도움말을 표시하고 끝마침니다"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              버번 정보 출력하고 종료"
 
-#: src/main.c:557
+#: src/main.c:569
 #, c-format
 msgid "Press any key..."
 msgstr ""
 
-#: src/main.c:638
+#: src/main.c:694
 #, fuzzy
 msgid "Filename encoding"
 msgstr "보내는 메일의 문자셋"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3157,19 +3149,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "메시지를 편집하는 창이 있습니다. 정말 끝내시겠습니까?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr ""
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "보내지지 않은 메시지가 큐에 있습니다. 지금 종료할까요?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3177,17 +3169,21 @@ msgstr ""
 "GnuPG가 적절하게 인스톨되지 않았거나 너무 오래된 버전입니다.\n"
 "OpenPGP 지원기능을 끕니다."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "다른 Sylpheed가 이미 실행되고 있습니다.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "동작 설정을 씁니다...\n"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3876,8 +3872,8 @@ msgstr "새 창을 만듭니다...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "메인 창: 색 할당 %d 실패\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "마침.\n"
 
@@ -4120,7 +4116,7 @@ msgstr "첨부"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' 파일을 저장할 수가 없습니다."
@@ -6244,19 +6240,19 @@ msgstr "첨부"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "제목"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "보낸 사람"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "날짜"
 
@@ -6266,7 +6262,7 @@ msgid "Number"
 msgstr "숫자"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 #, fuzzy
 msgid "To"
 msgstr "받는 사람:"
@@ -6561,30 +6557,30 @@ msgstr "%d개의 메시지가 발견되었습니다.\n"
 msgid "%d messages found."
 msgstr "%d개의 메시지가 발견되었습니다.\n"
 
-#: src/query_search.c:579
-#, fuzzy, c-format
-msgid "Searching %s ..."
-msgstr "%s 폴더를 스캔합니다..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "필터링..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, fuzzy, c-format
+msgid "Searching %s ..."
+msgstr "%s 폴더를 스캔합니다..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(날짜 없슴)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 #, fuzzy
 msgid "Save as search folder"
 msgstr "임시 보관함에 넣기"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 #, fuzzy
 msgid "Folder name:"
 msgstr "파일 이름"
@@ -6635,7 +6631,7 @@ msgstr ""
 msgid "Signature made at %s\n"
 msgstr ""
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "서명을 검증하는 도중 에러"
 
@@ -6664,7 +6660,7 @@ msgstr "이 프로그램은"
 msgid "%s - POP3 Remote mailbox"
 msgstr "메일박스를 제거합니다"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "번호"
 
@@ -6690,58 +6686,58 @@ msgid ""
 "%s"
 msgstr "인증 도중 에러 발생\n"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "메시지를 보내는 중 (%d / %d 바이트)"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "새 메시지의 갯수를 얻는 중 (STAT)..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 #, fuzzy
 msgid "No message"
 msgstr "새 메시지가 없습니다."
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "메시지를 지웁니다"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "끝마치는 중..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "새 메시지를 가져옴"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "메시지 보내기"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "새 메시지를 가져옴"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 #, fuzzy
 msgid "Delete messages"
 msgstr "메시지를 지웁니다"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6818,80 +6814,80 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "SMTP 서버에 연결하고 있습니다: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 #, fuzzy
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "HELO를 보냅니다..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "인증"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 #, fuzzy
 msgid "Sending message..."
 msgstr "메시지을 보내는 중"
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "EHLO를 보냅니다..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM을 보냅니다..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "보냅니다"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO를 보냅니다..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "DATA를 보냅니다..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "메시지를 보내는 중 (%d / %d 바이트)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr ""
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "메시지을 보내는 중"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "메시지를 보내는데 에러 발생"
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
 "%s"
 msgstr "메시지를 보내는데 에러 발생"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 #, fuzzy
 msgid "Can't connect to SMTP server."
 msgstr "%s:%d SMPT 서버에 연결할 수가 없습니다\n"
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, fuzzy, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "%s:%d SMPT 서버에 연결할 수가 없습니다\n"
@@ -6919,70 +6915,70 @@ msgstr "팝업 창에 서명 확인 결과 보이기"
 msgid "Checking signature"
 msgstr "서명 확인"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr ""
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "서명이 발견되지않음"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr ""
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Good signature"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr ""
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 msgid "Signature valid but expired"
 msgstr ""
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr ""
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr ""
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr ""
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr ""
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr ""
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "BAD signature"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "서명을 검증할 공개키가 없습니다"
 
@@ -7081,7 +7077,7 @@ msgstr "뉴스그룹 목록을 얻을 수가 없습니다."
 msgid "Can't retrieve newsgroup list."
 msgstr "뉴스그룹 목록을 얻을 수가 없습니다."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "완료."
 
@@ -7212,222 +7208,222 @@ msgstr "표시가 여전히 남아있습니다. 그것들을 처리할까요?"
 msgid "Scanning folder (%s)..."
 msgstr "폴더(%s)를 스캔..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 #, fuzzy
 msgid "_Search again"
 msgstr "다시 찾기"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "안 읽은 메시지가 없슴 "
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "안 읽은 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "안 읽은 메시지가 없습니다."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "안 읽은 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "새 메시지가 없습니다."
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "새 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "새 메시지가 없습니다."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "새 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "표시된 메시지가 없습니다"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "표시된 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "표시된 메시지가 없습니다."
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "표시된 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "꼬리표있는 메시지가 없습니다"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "꼬리표있는 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "꼬리표있는 메시지가 없습니다."
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "꼬리표있는 메시지가 없습니다. 처음부터 찾을까요?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d개 삭제됨"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d개 이동"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr ""
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " 아이템 선택"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 새 메시지, %d 안 읽음, %d개 메시지(%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 새 메시지, %d 안 읽음, %d개 메시지"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "요약을 정렬합니다..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\t메시지 데이타로부터 요약을 만듭니다..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "메시지 데이타로부터 요약을 만듭니다..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "요약 캐쉬 (%s)를 씁니다..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "메시지 %d가 표시되었습니다\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "메시지 %d가 읽은 것으로 표시되었습니다\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "메시지 %d가 읽지않은 것으로 표시되었습니다\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "메시지 %s/%d가 지울것으로 표시되었습니다\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "메시지를 지웁니다"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "정말로 이 메시지를 휴지통에서 삭제하시겠습니까?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "중복된 메시지를 지웁니다..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "메시지 %s/%d의 표시를 지웠습니다\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "메시지 %d가 %s로 이동하도록 했습니다\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "도착지가 현재 폴더와 같습니다"
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 #, fuzzy
 msgid "Select folder to move"
 msgstr "폴더 선택"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr ""
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "복사할 대상이 현재 폴더와 같습니다."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "폴더 선택"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "쓰레드를 만듭니다..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "쓰레드를 없앱니다..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "메시지 %d는 이미 캐쉬되었습니다.\n"
@@ -7523,36 +7519,42 @@ msgstr "임시 보관된 메시지를 보냅니다"
 msgid "E_xit"
 msgstr "끝내기"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 #, fuzzy
 msgid "Sylpheed"
 msgstr "예전 Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "서명이 발견되지않음"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "서버 정보"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "다른 Sylpheed가 이미 실행되고 있습니다.\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "표시 파일을 열 수가 없습니다.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "g_thread가 glib에의해 지원되지않습니다.\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "가져올 파일:"
 
diff --git a/po/lt.po b/po/lt.po
index f1304436..6625c7c7 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: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+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,226 +18,226 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Skaitoma kiekvienos sąskaitos konfigūracija...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 prisijungimas prie %s buvo nutrauktas. Jungiamasi...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP4 serveris panaikina LOGIN.\n"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "sukuriamas IMAP4 prisijungimas prie %s:%d ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "Negaliu sukurti TLS sesijos.\n"
 
-#: libsylph/imap.c:1176
-#, c-format
-msgid "Getting message %d"
+#: libsylph/imap.c:1230
+#, fuzzy, c-format
+msgid "Getting message %u"
 msgstr "Gaunamas laiškas %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Pridedami laiškai į %s (%d / %d)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Perkeliami laiškai %s į %s ..."
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopijuojami laiškai %s į %s ..."
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, c-format
 msgid "Removing messages %s"
 msgstr "Šalinami laiškai %s..."
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "negaliu nustatyti ištrynimo žymų: %s\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "negaliu išbraukti\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Trinami laiškai iš %s..."
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 msgid "can't set deleted flags: 1:*\n"
 msgstr "negaliu nustatyti ištrynimo žymų: 1:*\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "negaliu uždaryti katalogo\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "šakninis katalogas %s neegzistuoja\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "klaida gaunant LIST.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Negaliu sukurti „%s“\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "negaliu sukurti „%s“ po INBOX\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "negaliu sukurti dėžutės: nepavyko LIST\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "negaliu sukurti dėžutės\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "negaliu pervadinti dėžutės: %s į %s\n"
 
-#: libsylph/imap.c:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "negaliu ištrinti dėžutės\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "nagaliu gauti voko\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Gaunamos laiškų antraštės (%d / %d)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "nagaliu gauti voko\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "klaida gaunant voką.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "negaliu išanalizuoti voko: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Negaliu prisijungti prie IMAP4 serverio: %s:%d\n"
 
-#: libsylph/imap.c:2714
+#: libsylph/imap.c:2863
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Negaliu sukurti IMAP4 sesijos su: %s:%d\n"
 
-#: libsylph/imap.c:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "negalių gauti vardų zonos\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "negaliu pasirinkti katalogo: %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 msgid "error on imap command: STATUS\n"
 msgstr "klaida vykdant imap komandą: STATUS\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 autentiškumo tikrinimas nepavyko.\n"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "nepavyko prisijungti prie IMAP4\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "negaliu prirašyti %s į %s\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(siunčiamas failas...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "negaliu pridėti laiško į %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "negaliu nukopijuoti %s į %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "klaida vykdant imap komandą: STORE %s %s\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "klaida vykdant imap komandą: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "klaida vykdant imap komandą: CLOSE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv negali konvertuoti UTF-7 į %s\n"
 
-#: libsylph/imap.c:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv negali konvertuoti %s į UTF-7\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "negaliu rašyti į laikinąjį failą\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Gaunami laiškai iš %s į %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "negaliu perskaityti „mbox“ failo.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "neteisingas „mbox“ formatas: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "pažeistas „mbox“ failas: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "negaliu atverti laikinojo failo\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -246,66 +246,62 @@ msgstr ""
 "unescaped From found:\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "negaliu sukurti užrakto failo %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "naudokite „flock“ vietoj „file“ jei įmanoma.\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "negaliu sukurti %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "dėžutę turi kitas procesas, laukiu...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "negaliu užrakinti %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "blogas užrakto tipas\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "negaliu atrakinti %s\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "negaliu sumažinti dėžutės iki nulio.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Eksportuojami laiškai iš %s į %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "negaliu nukopijuoti laiško %s į %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "Negaliu atidaryti žymų failo.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "pradinis katalogas identiškas paskirties katalogui.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopijuojamas laiškas %s/%d į %s ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -314,7 +310,7 @@ msgstr ""
 "Failas „%s“ jau egzistuoja.\n"
 "Negaliu sukurti katalogo."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -333,77 +329,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "sukuriu NNTP prisijungimą prie %s:%d ...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 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:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "žinutė %d jau buvo įkelta.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "gaunama žinutė %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "negaliu perskaityti žinutės %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "negaliu paskelbti žinutės.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "negaliu gauti žinutės %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "negaliu pažymėti grupės: %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neteisingas žinučių intervalas: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "nėra naujų žinučių.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "gaunamas xover %d - %d, %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "negaliu gauti xover\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "klaida gaunant xover.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "bloga xover eilutė: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "negaliu gauti xhdr\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "klaida gaunant xhdr.\n"
 
@@ -460,27 +456,27 @@ msgstr "POP3: Trinamas senas laiškas %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: praleidžiamas laiškas %d (%d B)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "dėžutė užrakinta\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "baigėsi sesijai skirtas laikas\n"
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "negaliu pradėti TLS sesijos\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "klaida tikrinant autentiškumą\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "komanda nepalaikoma\n"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "klaida POP3 sesijoje\n"
 
@@ -511,16 +507,16 @@ msgstr "Nepageidautino pašto filtras"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Nepavyko konvertuoti kodo.\n"
 
-#: libsylph/procmsg.c:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "negali atidaryti žymų failo\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "negaliu gauti laiško %d\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Bloga spausdinimo komanda: „%s“\n"
@@ -675,7 +671,7 @@ msgstr ""
 "Nauji laiškai bus tikrinami šia tvarka. Pažymėkite laukelį\n"
 "skulpelyje „G“ jei norite gauti laiškus pasirinkę „Gauti visus“."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -816,7 +812,7 @@ msgstr "Įdėti adresą į knygą"
 msgid "Address"
 msgstr "Adresai"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Pastabos"
@@ -825,28 +821,28 @@ msgstr "Pastabos"
 msgid "Select Address Book Folder"
 msgstr "Pažymėkite adresų knygos katalogą"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Failas"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_Failas/Nauja _Knyga"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_Failas/Nauja „_vCard“ kortelė"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/_Failas/Naujas _JPilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 msgid "/_File/New _LDAP Server"
 msgstr "/_Failas/Naujas _LDAP serveris"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -854,100 +850,100 @@ msgstr "/_Failas/Naujas _LDAP serveris"
 msgid "/_File/---"
 msgstr "/_Failas/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_Failas/_Taisa"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_Failas/Išt_rinti"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_Failas/Iš_saugoti"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Failas/_Užverti"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Taisa"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Taisa/Kopi_juoti"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Taisa/Į_dėti"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/_Adresas"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/_Adresas/Naujas _adresas"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/_Adresas/Nauja _grupė"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/_Adresas/Naujas _katalogas"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/_Adresas/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/_Adresas/_Redaguoti"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/_Adresas/Išt_rinti"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Į_rankiai"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Į_rankiai/Importuoti _LDIF failą"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 msgid "/_Tools/Import _CSV file"
 msgstr "/Į_rankiai/Importuoti _CSV failą"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pagalba"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pagalba/_Apie"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Naujas _adresas"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Nauja _grupė"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Naujas _katalogas"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -960,79 +956,85 @@ msgstr "/Naujas _katalogas"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Ištrinti"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 msgid "/_Copy"
 msgstr "/_Kopijuoti"
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 msgid "/_Paste"
 msgstr "/Į_dėti"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "El. pašto adresas"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresų knyga"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Katalogas"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "El. pašto adresas"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Vardas:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Kam:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kopija:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Slapta kopija:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Pridėti"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Ieškoti"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 msgid "_Close"
 msgstr "Uždaryti"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Pašalinti adresą(-us)"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Ar tikrai pašalinti adresą(-us)?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1041,36 +1043,36 @@ msgstr ""
 "Ar tikrai norite pašalinti katalogą „%s“ ir visus adresus jame? \n"
 "Jei pašalinsite tik katalogą, adresai bus perkelti į aukštesnįjį katalogą."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Ištrinti katalogą"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "_Folder only"
 msgstr "Tik _katalogą"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "Folder and _addresses"
 msgstr "Katalogą ir _adresus jame"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Tikrai pašalinti „%s“?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Naujas vartotojas, negaliu išsaugoti „index“ failo."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Naujas vartotojas, negaliu išsaugoti adresų knygos failų."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Adresų knyga sėkmingai konvertuota"
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1078,7 +1080,7 @@ msgstr ""
 "Sena adresų knyga konvertuota,\n"
 "negaliu išsaugoti naujo adresų indekso failo"
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1086,7 +1088,7 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "bet sukūriau tuščius naujos knygos failus."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1094,7 +1096,7 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "negaliu sukurti naujos knygos failų."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1102,88 +1104,82 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "ir negaliu sukurti naujos knygos failų."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 msgid "Address book conversion error"
 msgstr "Adresų knygos konvertavimo klaida"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 msgid "Address book conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 msgid "Address Book Error"
 msgstr "Adresų knygos klaida"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Negaliu perskaityti adresų indekso"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr "Sena knyga konvertuota, negaliu išsaugoti naujo adresų indekso failo"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Negaliu konvertuoti adresų knygos, bet sukūriau naujus tuščius adresų knygos "
 "failus."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Negaliu konvertuoti adresų knygos, negaliu sukurti naujų adresų knygos failų."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Negaliu konvertuoti adresų knygos ir sukurti naujų adresų knygos failų."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 msgid "Address Book Conversion Error"
 msgstr "Adresų knygos konvertavimo klaida"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 msgid "Address Book Conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Sąsaja"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresų knyga"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Asmuo"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Grupė"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Katalogas"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "LDAP serveris"
 
@@ -1195,15 +1191,15 @@ msgstr "Bendras adresas"
 msgid "Personal address"
 msgstr "Asmeninis adresas"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Pranešimas"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Įspėjimas"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Klaida"
 
@@ -1246,7 +1242,7 @@ msgstr "Ruda"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Nieko"
 
@@ -1577,8 +1573,8 @@ msgstr "Laiškas: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Negaliu gauti sudėtinės laiško dalies"
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Nėra temos)"
 
@@ -1770,7 +1766,7 @@ msgstr "MIME tipas"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Dydis"
 
@@ -2010,12 +2006,12 @@ msgstr "Redaguoti katalogą"
 msgid "Input the new name of folder:"
 msgstr "Įveskite katalogo pavadinimą:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Naujas katalogas"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Įveskite naujo katalogo pavadinimą:"
 
@@ -2161,7 +2157,7 @@ msgstr "Eksportuoti"
 msgid "Specify source folder and destination file."
 msgstr "Nurodykite „mbox“ failą ir paskyrimo katalogą."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Datos formatas"
@@ -2176,7 +2172,7 @@ msgstr "Pradinis katalogas:"
 msgid "Destination:"
 msgstr "Paskyrimo katalogas:"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2188,7 +2184,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Pasirinkti... "
@@ -2248,23 +2244,23 @@ msgstr "Šiukšlinė"
 msgid "Drafts"
 msgstr "Juodraščiai"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "NaujasKatalogas"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "„%c“ negali būti katalogo pavadinime."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalogas „%s“ egzistuoja."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Negaliu sukurti katalogo „%s“."
@@ -2390,31 +2386,31 @@ msgstr "Tikrinami nauji laiškai visuose kataloguose..."
 msgid "Junk"
 msgstr "Nepageidautinas"
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pažymėtas katalogas „%s“\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Gaunami laiškai („%s“)..."
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Gauti visus laiškus kataloge „%s“?"
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 msgid "Download all messages"
 msgstr "Gauti visus laiškus"
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Klaida gaunant laiškus kataloge „%s“."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2424,26 +2420,26 @@ msgstr ""
 "(jei norite sukurti katalogą talpinti pakatalogiams,\n"
 " pridėkite „/“ prie vardo pabaigos)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Įveskite naują „%s“ pavadinimą:"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Pervadinti katalogą"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Negaliu pervadinti katalogo „%s“"
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Negaliu perkelti katalogo „%s“"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2452,11 +2448,11 @@ msgstr ""
 "Ištrinti paieškos katalogą „%s“ ?\n"
 "Tikri laiškai nebus trinami."
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 msgid "Delete search folder"
 msgstr "Ištrinti paieškos katalogą"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2469,20 +2465,20 @@ msgstr ""
 "\n"
 "Ar tikrai norite ištrinti?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Negaliu pašalinti katalogo „%s“"
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Išvalyti šiukšlinę"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 msgid "Delete all messages in the trash folder?"
 msgstr "Ištrinti visus laiškus šiukšlinėje?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2491,34 +2487,34 @@ msgstr ""
 "Ar tikrai pašalinti dėžutę „%s“ ?\n"
 "(laiškai NEBUS ištrinti iš disko)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "Pašalinti dėžutę"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ar tikrai ištrinti IMAP4 sąskaitą „%s“?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "Ištrinti IMAP4 sąskaitą"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ar tikrai ištrinti naujienų grupę „%s“?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Ištrinti naujienų grupę"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ar tikrai pašalinti naujienų sąskaitą „%s“?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Pašalinti naujienų sąskaitą"
 
@@ -2530,8 +2526,8 @@ msgstr "Naujienų grupės"
 msgid "Creating header view...\n"
 msgstr "Sukuria antraščių peržiūra...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Nėra gavėjo)"
 
@@ -2543,71 +2539,71 @@ msgstr "Sukuriama paveikslėlio peržiūra...\n"
 msgid "Can't load the image."
 msgstr "Negaliu įkelti paveikslėlio."
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Failas %s neegzistuoja\n"
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Nurodykite „mbox“ failą ir paskyrimo katalogą."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Ieškoma „%s“..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Importuoti"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Skanuojamas katalogas „%s“..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Klaida skelbiant žinutę\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Importuoti"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Nurodykite „mbox“ failą ir paskyrimo katalogą."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Pradinis katalogas:"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Paskyrimo katalogas:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Naujas katalogas"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Nurodykite „mbox“ failą ir paskyrimo katalogą."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Pažymėkite importuojamą failą"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Pažymėkite importuojamą failą"
 
@@ -2760,156 +2756,156 @@ msgstr "Importuoti LDIF failą į adresų knygą"
 msgid "Attributes"
 msgstr "Atributai"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nauji laiškai"
 
-#: src/inc.c:477
+#: src/inc.c:478
 msgid "Authenticating with POP3"
 msgstr "Tikrinamas autentiškumas (POP3)"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Gaunami nauji laiškai"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "Laukiama"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Nutraukta"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Gaunama"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Atlikta (gauta laiškų: %d (%s))"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Nėra naujų laiškų."
 
-#: src/inc.c:708
+#: src/inc.c:715
 #, fuzzy
 msgid "Done"
 msgstr "Atlikta."
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Nepavyko prisijungti"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Nepavyko patvirtinti autentiškumo"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Užrakinta"
 
-#: src/inc.c:730
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Baigėsi skirtasis laikas"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Baigta (Nauji laiškai: %d)"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, fuzzy, c-format
 msgid "Finished (no new messages)"
 msgstr "Baigta (Nėra naujų laiškų: %d)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "Klaidos gaunant paštą."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "gaunami „%s“ sąskaitos laiškai...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Tikrinamas autentiškumas (POP3)"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: gaunami nauji laiškai"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Jungiuosi prie POP3 serverio: %s..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Negaliu prisijungti prie POP3 serverio: %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Patvirtinamas autentiškumas..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Gaunami laiškai iš %s..."
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Gaunamas naujų laiškų skaičius (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Gaunamas naujų laiškų skaičius (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Gaunamas naujų laiškų skaičius (UILD)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Gaunamas naujų laiškų dydis (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "Trinamas laiškas %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Išeinu"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Gaunamas laiškas (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 msgid "Connection failed."
 msgstr "Nepavyko prisijungti."
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "Klaida tvarkant paštą."
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2918,29 +2914,29 @@ msgstr ""
 "Klaida tvarkant paštą:\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Nėra vietos diske."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "Negaliu įrašyti į failą."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "Socket error."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Prisijungimas uždarytas nuotolinio serverio."
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "Dėžutė užrakinta."
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2949,11 +2945,11 @@ msgstr ""
 "Dėžutė užrakinta:\n"
 "%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Nepavyko patvirtinti autentiškumo."
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2962,15 +2958,15 @@ msgstr ""
 "Nepavyko patvirtinti autentiškumo:\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Baigėsi sesijos laikas."
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "Prijungimas nutrauktas\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Gaunami nauji laiškai iš %s į %s...\n"
@@ -2984,24 +2980,20 @@ msgstr "Įveskite slaptažodį vartotojui %s severyje %s:"
 msgid "Input password"
 msgstr "Įveskite slaptažodį"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Protokolo logas"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "glib nepalaiko g_thread.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Naudojimas: %s [PARAMETRAI]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    atverti rašymo langą"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3011,23 +3003,23 @@ msgstr ""
 "                         atverti rašymo langą su prisegtais nurodytais\n"
 "                         failais"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              gauti naujus laiškus"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          gauti naujus laiškus iš visų sąskaitų"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 siųsti laiškus eilėje"
 
-#: src/main.c:542
+#: src/main.c:554
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [katalogas]... rodyti bendrą laiškų skaičių"
 
-#: src/main.c:543
+#: src/main.c:555
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3035,45 +3027,45 @@ msgstr ""
 "  --status-full [katalogas]...\n"
 "                         rodyti kiekvieno katalogo būseną"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr "  --configdir kelias     nurodyti konfigūracijos katalogą"
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:550
+#: src/main.c:562
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 uždaryti „Sylpheed“"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                derinimo rėžimas"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 rodyti šią pagalbą ir baigti"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              išvesti versiją ir baigti"
 
-#: src/main.c:557
+#: src/main.c:569
 #, c-format
 msgid "Press any key..."
 msgstr "Spauskite bet kurį klavišą..."
 
-#: src/main.c:638
+#: src/main.c:694
 msgid "Filename encoding"
 msgstr "Failų vardų koduotė"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3097,19 +3089,19 @@ msgstr ""
 "\n"
 "Tęsti?"
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "Rašomas laiškas. Tikrai išeiti?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Laiškai eilėje"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Eilėje yra neišsiųstų laiškų. Išeiti dabar?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3117,16 +3109,20 @@ msgstr ""
 "GnuPG nėra įdiegtas, arba jo versija per sena.\n"
 "OpenPGP palaikymas išjungtas."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "Sylpheed jau paleistas.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 msgid "Migration of configuration"
 msgstr "Konfigūracijos atnaujinimas"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3776,8 +3772,8 @@ msgstr "Kuriamas pagrindinis langas..\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: nepavyko spalvos priskyrimas %d\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "atlikta.\n"
 
@@ -4035,7 +4031,7 @@ msgstr "Priedai"
 msgid "Message View - Sylpheed"
 msgstr "Laiško peržiūra - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Negaliu išsaugoti failo „%s“."
@@ -6088,19 +6084,19 @@ msgstr "Priedas"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Siuntėjas"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Data"
 
@@ -6110,7 +6106,7 @@ msgid "Number"
 msgstr "Numeris"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 #, fuzzy
 msgid "To"
 msgstr "Kam:"
@@ -6398,29 +6394,29 @@ msgstr "Rasta laiškų: %d.\n"
 msgid "%d messages found."
 msgstr "Rasta laiškų: %d.\n"
 
-#: src/query_search.c:579
-#, c-format
-msgid "Searching %s ..."
-msgstr "Ieškoma „%s“..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Ieškoma %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, c-format
+msgid "Searching %s ..."
+msgstr "Ieškoma „%s“..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Be datos)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 msgid "Save as search folder"
 msgstr "Išsaugoti kaip paieškos katalogą"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr "Vieta:"
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 msgid "Folder name:"
 msgstr "Katalogo vardas:"
 
@@ -6466,7 +6462,7 @@ msgstr "\t\taka „%s“\n"
 msgid "Signature made at %s\n"
 msgstr "Pasirašyta %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Klaida tikrinant parašą"
 
@@ -6495,7 +6491,7 @@ msgstr "Apie"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Pašalinti dėžutę"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "Nr."
 
@@ -6521,58 +6517,58 @@ msgid ""
 "%s"
 msgstr "klaida POP3 sesijoje\n"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Gaunamos laiškų antraštės (%d / %d)"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Gaunamas naujų laiškų skaičius (STAT)..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 #, fuzzy
 msgid "No message"
 msgstr "Nėra naujų laiškų."
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Ištrinti laišką(-us)"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Išeinu..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Gaunami nauji laiškai"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Siųsti laišką"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Gaunami nauji laiškai"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Gaunami laiškai iš %s..."
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 #, fuzzy
 msgid "Delete messages"
 msgstr "Ištrinti laišką(-us)"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6653,66 +6649,66 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Jungiuosi prie SMTP serverio: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Įvyko klaida po QUIT komandos (ignoruojama)"
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "Siunčiu HELO..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "Tikrinamas autentiškumas"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 msgid "Sending message..."
 msgstr "Siunčiu laišką..."
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "Siunčiu EHLO..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Siunčiu MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Siunčiu"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Siunčiu RCTP TO..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Siunčiu DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Siunčiu laišką (%d / %d baitai)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr ""
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Siunčiu laišką"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "Klaida siunčiant laišką."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6721,12 +6717,12 @@ msgstr ""
 "Klaida siunčiant laišką:\n"
 "%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 #, fuzzy
 msgid "Can't connect to SMTP server."
 msgstr "Negaliu prisijungti prie NNTP serverio: %s:%d\n"
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, fuzzy, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Negaliu prisijungti prie NNTP serverio: %s:%d\n"
@@ -6751,70 +6747,70 @@ msgstr "Parašo tikrinimo rezultatas"
 msgid "Checking signature"
 msgstr "Tikrinamas parašas"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s iš „%s“"
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Parašas nerastas"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Geras parašas nuo „%s“"
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Geras parašas"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Geras parašas, bet „%s“ raktas nėra patikimas"
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Geras parašas (nepatikimas raktas)"
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr "„%s“ parašas geras, bet baigėsi galiojimas"
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 msgid "Signature valid but expired"
 msgstr "Parašas geras, bet baigėsi galiojimas"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr "Parašas geras, bet baigėsi „%s“ rakto galiojimas"
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr "Parašas geras, bet baigėsi rakto galiojimas"
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr "Parašas geras, bet raktas „%s“ buvo pakeistas"
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr "Parašas geras, bet raktas buvo pakeistas"
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "BLOGAS „%s“ parašas"
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "BLOGAS parašas"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "Nėra viešo rakto parašui patikrinti"
 
@@ -6911,7 +6907,7 @@ msgstr "Gaunamas naujienų grupių sąrašas..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Negaliu gauti naujienų grupių sąrašo."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Atlikta."
 
@@ -7038,219 +7034,219 @@ msgstr "Palikta žymių. Vykdyti jas?"
 msgid "Scanning folder (%s)..."
 msgstr "Skanuojamas katalogas (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 msgid "_Search again"
 msgstr "_Ieškoti dar kartą"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Daugiau nėra neskaitytų laiškų."
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "Nėra neskaitytų laiškų. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Nėra neskaitytų laiškų."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "Nėra neskaitytų laiškų. Eiti į kitą katalogą?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Daugiau nėra naujų laiškų."
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "Nėra naujų laiškų. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Nėra naujų laiškų."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "Nėra naujų laiškų. Eiti į kitą katalogą?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Daugiau nėra pažymėtų laiškų"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "Nėra pažymėtų laiškų. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Nėra pažymėtų laiškų."
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nėra pažymėtų laiškų. Ieškoti nuo pradžios?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Daugiau nėra laiškų su etiketėmis"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "Nėra laiškų su etiketėmis. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Nėra laiškų su etiketėmis."
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nėra laiškų su etiketėmis. Ieškoti nuo pradžios?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Laiškai pritraukiami pagal temą..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d ištrinta"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d perkelta"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d nukopijuota"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " objektas(-ai) pažymėti"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "nauji: %d, neskaityti: %d, viso: %d (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "nauji: %d, neskaityti: %d, viso: %d"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Rikiuojama santrauka..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tNustatoma santrauka iš laiško duomenų..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Nustatoma santrauka iš laiško duomenų..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Rašoma santraukos laikinoji atmintis (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Laiškas %d pažymėtas\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Laiškas %d pažymėtas kaip skaitytas\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Laiškas %d pažymėtas kaip neskaitytas\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Laiškas %s/%d pažymėtas trinimui\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Ištrinti laišką(-us)"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Ar tikrai norite ištrinti laiškus iš šiukšlinės?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Trinami identiški laiškai..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Laiškas %s/%d atžymėtas\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Laiškas %d pažymėtas perkėlimui į %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "Paskirtis yra tas pats katalogas."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Pasirinkti katalogą"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Laiškas %d pažymėtas kopijavimui į %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 msgid "Destination for copy is same as current folder."
 msgstr "Kopijavimo paskirtis yra tas pats katalogas."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Pasirinkti katalogą"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 msgid "Error occurred while processing messages."
 msgstr "Klaida vykdant operacijas su laiškais."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Statomos gijos..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Griaunamos gijos..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtruojama (%d / %d)..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "filtruojama..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Filtruojama..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Filtruota laiškų: %d"
@@ -7339,35 +7335,41 @@ msgstr "_Siųsti laiškus eilėje"
 msgid "E_xit"
 msgstr "Iš_eiti"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 msgid "Sylpheed"
 msgstr "„Sylpheed“"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "Parašas nerastas"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "Severio informacija"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "Sylpheed jau paleistas.\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "Negaliu atidaryti žymų failo.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "glib nepalaiko g_thread.\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "Importuojamas failas:"
 
diff --git a/po/nl.po b/po/nl.po
index 320c9f60..4ebd700c 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: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+0900\n"
 "PO-Revision-Date: 2006-04-30 01:11+0100\n"
 "Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -18,229 +18,229 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Configuratie inlezen van alle accounts...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 "IMAP4 verbinding naar %s is verbroken. Contact wordt opnieuw gelegd...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP4 server schakelt LOGIN uit.\n"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "IMAP4 verbinding naar %s:%d wordt opgezet...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "Kan geen TLS sessie starten.\n"
 
-#: libsylph/imap.c:1176
-#, c-format
-msgid "Getting message %d"
+#: libsylph/imap.c:1230
+#, fuzzy, c-format
+msgid "Getting message %u"
 msgstr "Ophalen van bericht %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Berichten toevoegen aan %s (%d / %d)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Berichten %s worden verplaatst naar %s ..."
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Berichten %s worden gekopieerd naar %s..."
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, c-format
 msgid "Removing messages %s"
 msgstr "Berichten %s worden verwijderd"
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kan verwijderd-vlaggen niet instellen: %s\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "kan niet wissen\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Alle berichten in %s worden verwijderd"
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kan de verwijderd-vlaggen niet instellen: 1:*\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "kan map niet sluiten\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "De beginmap %s bestaat niet\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "er is een fout opgetreden bij het ophalen van de lijst.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr ""
 "kan %s niet aanmaken\n"
 "\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "kan %s niet aanmaken onder INBOX\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan geen mailbox maken: LIST mislukt\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "kan geen mailbox maken\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, 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:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "kan de mailbox niet verwijderen\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "kan de envelop niet verkrijgen\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Ophalen van berichtkoppen (%d / %d)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "kan de envelop niet verkrijgen\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "Er is een fout opgetreden bij het verkrijgen van de envelop.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kan de envelop niet verwerken: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, 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:2714
+#: libsylph/imap.c:2863
 #, 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:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "kan de NAMESPACE niet vinden\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan map niet selecteren: %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 msgid "error on imap command: STATUS\n"
 msgstr "Fout bij IMAP-opdracht: STATUS\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4-identificatie mislukt.\n"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login mislukt.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan %s niet toevoegen aan %s\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(bestand wordt verzonden...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kan bericht niet toevoegen aan %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan %s niet naar %s kopiëren\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Fout bij IMAP-opdracht: STORE %s %s\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Fout tijdens IMAP opdracht: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "Fout bij IMAP-opdracht: CLOSE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan UTF-7 niet naar %s omzetten\n"
 
-#: libsylph/imap.c:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan %s niet naar UTF-7 omzetten\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "kan niet naar tijdelijk bestand schrijven\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Berichten worden van %s naar %s opgehaald...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "kan mbox bestand niet inlezen.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "mbox formaat is onjuist: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "onjuist formaat in mbox: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "kan tijdelijk bestand niet openen\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -249,66 +249,62 @@ msgstr ""
 "Afzender zonder escapecodes gevonden:\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "kan lock-bestand niet aanmaken: %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "gebruik 'flock' in plaats van 'file' waar mogelijk\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "kan %s niet aanmaken\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "mailbox wordt vastgehouden door een ander proces. we wachten even...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "kan %s niet locken\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "ongeldig locktype\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "kan de lock niet verwijderen van %s\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "kan de mailbox niet inkorten tot 0.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Berichten worden geëxporteerd van %s naar %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, 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:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "kan het bestand met markeringen niet openen\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "de bronmap is hetzelfde als de doelmap.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Bericht %s%c%d wordt gekopieerd naar %s...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -317,7 +313,7 @@ msgstr ""
 "Bestand '%s' bestaat al.\n"
 "Kan geen map aanmaken."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -336,79 +332,79 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "verbinding met nieuwsserver (NNTP) %s%d wordt opgezet...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr ""
 "De NNTP-verbinding met %s:%d is verbroken. Opnieuw contact aan het "
 "leggen...\n"
 
-#: libsylph/news.c:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "artikel %d is al gebufferd.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "artikel %d wordt opgehaald...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "kan artikel %d niet lezen\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "kan het ertikel niet versturen.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "kan het artikel %d niet ophalen\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "kan de groep niet selecteren: %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ongeldig artikelbereik: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "geen nieuwe artikelen.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "xover %d - %d uit %s wordt opgehaald...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "Kan xover niet ophalen\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "er is een fout opgetreden tijdens het ophalen van de xover.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "Ongeldige xover regel: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "Kan xhdr niet ophalen\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "er is een fout opgetreden tijdens het ophalen van de xhdr.\n"
 
@@ -466,27 +462,27 @@ msgstr "POP3: Bezig met verwijderen van verlopen bericht %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Bericht %d wordt overgeslagen (%d bytes)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "postbusis vergrendeld\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "sessie time-out\n"
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "Kan TLS sessie niet starten\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "er is een fout opgetreden tijdens de identificatie\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "opdracht niet ondersteund\n"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "er is een fout opgetreden tijdens de POP3-sessie\n"
 
@@ -518,16 +514,16 @@ msgstr "Troepfilter"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Codeconversie mislukt\n"
 
-#: libsylph/procmsg.c:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "kan het bestand met markeringen niet openen\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kan bericht %d niet ophalen\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Adrukopdracht is ongeldig: '%s'\n"
@@ -685,7 +681,7 @@ msgstr ""
 "Zet een vinkje in de 'G' kolom om berichten binnen te halen wanneer\n"
 "u op de knop 'Alles ophalen' klikt."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -826,7 +822,7 @@ msgstr "Adres toevoegen aan adresboek"
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Opmerkingen"
@@ -835,28 +831,28 @@ msgstr "Opmerkingen"
 msgid "Select Address Book Folder"
 msgstr "Selecteer adresboekmap"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Bestand"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_Bestand/Nieuw _adresboek"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_Bestand/Nieuwe _vCard"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/_Bestand/Nieuwe _JPilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 msgid "/_File/New _LDAP Server"
 msgstr "/_Bestand/Nieuwe _LDAP-server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -864,101 +860,101 @@ msgstr "/_Bestand/Nieuwe _LDAP-server"
 msgid "/_File/---"
 msgstr "/_Bestand/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_Bestand/Aanpassen"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_Bestand/_Verwijderen"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_Bestand/_Opslaan"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Bestand/_Sluiten"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Be_werken"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Be_werken/_Kopiëren"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/Be_werken/_Plakken"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/_Adres/Nieuw _adres"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/_Adres/Nieuwe _groep"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/_Adres/Nieuwe _map"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/_Adres/_Bewerken"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Verwijderen"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Gereedschap"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hulp/_Info"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Nieuw _adres"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Nieuwe _groep"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Nieuwe _map"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -971,82 +967,88 @@ msgstr "/Nieuwe _map"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/Ver_wijderen"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopieer..."
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 #, fuzzy
 msgid "/_Paste"
 msgstr "/Be_werken/_Plakken"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "E-mail adres"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Accounts"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "E-mail adres"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Naam:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Aan:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Zoeken"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 #, fuzzy
 msgid "_Close"
 msgstr "Kleuren"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Adres(sen) verwijderen"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Wilt u de adressen werkelijk verwijderen?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1056,36 +1058,36 @@ msgstr ""
 "Als u alleen de map verwijdert, dan zullen de adressen naar de \n"
 "hoger gelegen map verplaatst worden."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Verwijder map"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "_Folder only"
 msgstr "Alleen _map"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "Folder and _addresses"
 msgstr "Map en _adressen"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Wilt u '%s' werkelijk verwijderen?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Nieuwe gebruiker: Kon indexbestand niet opslaan."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Nieuwe gebruiker: Kon adresboekbestanden niet opslaan."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Oude adresboekgegevens succesvol omgezet."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1093,7 +1095,7 @@ msgstr ""
 "Oude adresboekgegevens omgezet.\n"
 "Kon het nieuwe adresboek indexbestand niet opslaan."
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1101,7 +1103,7 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Nieuw leeg adresboek is gemaakt."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1109,7 +1111,7 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Kon geen nieuwe adresboek bestanden aanmaken."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1117,95 +1119,89 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Kon ook geen nieuwe adresboekbestanden aanmaken."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adresboek omzetting"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adresboekprobleem"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Kon adresboek index niet lezen"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Oude adresboekgegevens omgezet. Kon het nieuwe adresboek indexbestand niet "
 "opslaan."
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Kon adresboekgegevens niet omzetten. Nieuw leeg adresboek is gemaakt."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Kon adresboekgegevens niet omzetten. Kon geen nieuwe adresboek bestanden "
 "aanmaken."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Kon adresboekgegevens niet omzetten. Kon ook geen nieuwe adresboek bestanden "
 "aanmaken."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adresboek Omzetting"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Groep"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Accounts"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1217,15 +1213,15 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Bericht"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Fout"
 
@@ -1268,7 +1264,7 @@ msgstr "Bruin"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Geen"
 
@@ -1603,8 +1599,8 @@ msgstr "Bericht: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Ik kan het deel van een meerdelig bericht niet ophalen."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
@@ -1796,7 +1792,7 @@ msgstr "MIME-type"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Grootte"
 
@@ -2039,12 +2035,12 @@ msgstr "Map hernoemen"
 msgid "Input the new name of folder:"
 msgstr "Geef de nieuwe naam van de map:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Geef de naam van de nieuwe map:"
 
@@ -2191,7 +2187,7 @@ msgstr "Exporteren"
 msgid "Specify source folder and destination file."
 msgstr "Specificeer mbox bestand (bron) en de doelmap."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Datumopmaak"
@@ -2206,7 +2202,7 @@ msgstr "Bronmap:"
 msgid "Destination:"
 msgstr "Doelmap:"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2218,7 +2214,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "Selecteer..."
@@ -2279,23 +2275,23 @@ msgstr "Prullenbak"
 msgid "Drafts"
 msgstr "Klad"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "NieuweMap"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' mag niet in de naam van een map."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "De map '%s' bestaat al."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan map '%s' niet aanmaken."
@@ -2422,32 +2418,32 @@ msgstr "Bezig met controleren op nieuwe berichten in alle mappen..."
 msgid "Junk"
 msgstr "Troep"
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Map %s is geselecteerd\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Downloaden van berichten in %s ..."
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Downloaden van berichten in %s ..."
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 #, fuzzy
 msgid "Download all messages"
 msgstr "Downloaden van berichten in %s ..."
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Er is een fout opgetreden bij het downloaden van berichten in '%s'."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2457,26 +2453,26 @@ msgstr ""
 "(Als je een map wilt maken om daarin submappen te plaatsen,\n"
 "sluit de naam dan af met een '/')"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Geef een nieuwe naam voor '%s':"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Hernoem map"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kan map '%s' niet hernoemen."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan map '%s' niet verplaatsen."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2485,11 +2481,11 @@ msgstr ""
 "Wilt u de zoekmap '%s' verwijderen?\n"
 "De berichten zelf zullen NIET worden verwijderd."
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 msgid "Delete search folder"
 msgstr "Zoekmap verwijderen"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2502,20 +2498,20 @@ msgstr ""
 "\n"
 "Wilt u werkelijk verwijderen?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan map '%s' niet verplaatsen."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 msgid "Delete all messages in the trash folder?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2524,34 +2520,34 @@ msgstr ""
 "Wilt u de '%s' mailbox werkelijk verwijderen?\n"
 "(De berichten zelf zullen NIET van de schijf worden verwijderd)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "mailbox verwijderen"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4 account '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "Verwijder IMAP4 account"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Nieuwsgroep '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Verwijder nieuwsgroep"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Nieuwsaccount '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Verwijder nieuwsaccount"
 
@@ -2563,8 +2559,8 @@ msgstr "Nieuwsgroepen:"
 msgid "Creating header view...\n"
 msgstr "Header view wordt aangemaakt...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Geen afzender)"
 
@@ -2576,71 +2572,71 @@ msgstr "Plaatje wordt weergegeven...\n"
 msgid "Can't load the image."
 msgstr "Kan plaatje niet weergeven."
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Specificeer mbox bestand (bron) en de doelmap."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Doorzoeken van %s ..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Importeren"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Bezig met inlezen van map %s ..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Er is een fout opgetreden bij het versturen\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Importeren"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Specificeer mbox bestand (bron) en de doelmap."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Bronmap:"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Doelmap:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nieuwe map"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Specificeer mbox bestand (bron) en de doelmap."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Selecteer het te importeren bestand"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Selecteer het te importeren bestand"
 
@@ -2802,157 +2798,157 @@ msgstr "Importeer LDIF bestand in het adresboek"
 msgid "Attributes"
 msgstr "Attributen"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nieuwe berichten"
 
-#: src/inc.c:477
+#: src/inc.c:478
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Bezig met identificatie"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "Een ogenblik geduld alstublieft"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Afgebroken"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Bezig met ophalen"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Klaar (%d bericht(en) (%s) ontvangen)"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Geen nieuwe berichten."
 
-#: src/inc.c:708
+#: src/inc.c:715
 #, fuzzy
 msgid "Done"
 msgstr "Klaar."
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Identificatie mislukt"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Vergrendeld"
 
-#: src/inc.c:730
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Time-out"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Klaar (%d nieuwe bericht(en))"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Klaar (geen nieuwe berichten)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "Er is een fout opgetreden bij het ophalen van de e-mail."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "nieuwe berichten voor account %s worden opgehaald...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Bezig met identificatie"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Verbinden met POP3-server: %s ..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan niet verbinden met POP3 server: %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Bezig met identificatie..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Berichten ophalen van %s..."
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Opvragen van het aantal nieuwe berichten (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Opvragen van het aantal nieuwe berichten (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Opvragen van de grootte van de nieuwe berichten (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "Bezig met verwijderen van bericht %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Bezig met afsluiten"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Bericht wordt opgehaald (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 msgid "Connection failed."
 msgstr "Verbinding mislukt."
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "Fout bij het verwerken van de e-mail"
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2961,30 +2957,30 @@ msgstr ""
 "Fout bij het verwerken van de e-mail:\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "De ruimte op de schijf is op."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "Het bestand is niet beschrijfbaar."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "Socket-fout."
 
 #  consider EOF right after QUIT successful
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Verbinding verbroken door verbindingspartner."
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "Mailbox is vergrendeld."
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2993,11 +2989,11 @@ msgstr ""
 "Mailbox is vergrendeld:\n"
 "%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Identificatie mislukt."
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3006,15 +3002,15 @@ msgstr ""
 "Identificatie mislukt:\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Sessie is verlopen."
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "E-mail verwerken geannuleerd\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Nieuwe berichten worden opgehaald van %s naar %s ...\n"
@@ -3028,24 +3024,20 @@ msgstr "Geef wachtwoord voor %s op %s:"
 msgid "Input password"
 msgstr "Geef wachtwoord"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Protocol-logboek"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread is niet ondersteunt door glib\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Gebruik: %s [OPTIES]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]      open venster \"Bericht opstellen\""
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3055,23 +3047,23 @@ msgstr ""
 "                         venster 'bericht opstellen' openen met de\n"
 "                         gespecificeerde bestanden als bijlagen"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              haal nieuwe berichten op"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          Berichten ophalen van alle accounts"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 verstuur alle berichten uit de wachtrij"
 
-#: src/main.c:542
+#: src/main.c:554
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [map]...      totaal aantal berichten weergeven"
 
-#: src/main.c:543
+#: src/main.c:555
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3079,47 +3071,47 @@ msgstr ""
 "  --status-full [map]...\n"
 "                         status van iedere map weergeven"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir mapnaam    de map waar de configuratiebestanden zich in "
 "bevinden"
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:550
+#: src/main.c:562
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 Sylpheed afsluiten"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug modus"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 geef deze hulp weer"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr " --version\t\tgeef versie informatie en sluit af"
 
-#: src/main.c:557
+#: src/main.c:569
 #, c-format
 msgid "Press any key..."
 msgstr "Druk op een toets..."
 
-#: src/main.c:638
+#: src/main.c:694
 msgid "Filename encoding"
 msgstr "Bestandscodering"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3143,21 +3135,21 @@ msgstr ""
 "\n"
 "Toch doorgaan?"
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr ""
 "U bent een bericht aan het opstellen.\n"
 "Wilt u werkelijk het programma afsluiten?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Berichten zijn in de wachtrij gezet"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Er staan nog berichten in de wachtrij. Toch afsluiten?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3165,16 +3157,20 @@ msgstr ""
 "GnuPG is niet goed geïnstalleerd of is te oud.\n"
 "OpenPGP ondersteuning wordt uitgeschakeld."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "er draait al een Sylpheed.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 msgid "Migration of configuration"
 msgstr "Configuratie omzetten"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3830,8 +3826,8 @@ msgstr "Hoofdvenster wordt aangemaakt...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HoofdVenster: kleur %d kon niet gealloceerd worden\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "klaar.\n"
 
@@ -4097,7 +4093,7 @@ msgstr "Bijlagen"
 msgid "Message View - Sylpheed"
 msgstr "Nieuw bericht - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan het bestand '%s' niet opslaan."
@@ -6178,19 +6174,19 @@ msgstr "Bijlage"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Onderwerp"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Afzender"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Datum"
 
@@ -6200,7 +6196,7 @@ msgid "Number"
 msgstr "Nummer"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 #, fuzzy
 msgid "To"
 msgstr "Aan:"
@@ -6501,29 +6497,29 @@ msgstr "%d berichten gevonden\n"
 msgid "%d messages found."
 msgstr "%d berichten gevonden\n"
 
-#: src/query_search.c:579
-#, c-format
-msgid "Searching %s ..."
-msgstr "Doorzoeken van %s ..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Doorzoeken van %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, c-format
+msgid "Searching %s ..."
+msgstr "Doorzoeken van %s ..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Geen datum)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 msgid "Save as search folder"
 msgstr "Opslaan als zoekmap"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr "Locatie:"
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 msgid "Folder name:"
 msgstr "mapnaam:"
 
@@ -6570,7 +6566,7 @@ msgstr "\t\taka \"%s\"\n"
 msgid "Signature made at %s\n"
 msgstr "Handtekening gemaakt op %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Er is een fout opgetreden bij het controleren van de handtekening"
 
@@ -6598,7 +6594,7 @@ msgstr "_Info"
 msgid "%s - POP3 Remote mailbox"
 msgstr "mailbox verwijderen"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "Nr."
 
@@ -6624,58 +6620,58 @@ msgid ""
 "%s"
 msgstr "er is een fout opgetreden tijdens de POP3-sessie\n"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Ophalen van berichtkoppen (%d / %d)"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 #, fuzzy
 msgid "No message"
 msgstr "Geen nieuwe berichten."
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Verwijder bericht(en)"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Bezig met afsluiten..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Nieuwe berichten worden opgehaald"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Verzend bericht"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Nieuwe berichten worden opgehaald"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Berichten ophalen van %s..."
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 #, fuzzy
 msgid "Delete messages"
 msgstr "Verwijder bericht(en)"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6756,67 +6752,67 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Bezig met verbinden met SMTP server: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 #, fuzzy
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Fout opgetreden bij sturen van de opdracht\n"
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "Bezig met sturen van HELO..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "Bezig met identificatie"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 msgid "Sending message..."
 msgstr "Bericht verzenden..."
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "Bezig met sturen van EHLO..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Bezig met verzenden van MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Bezig met verzenden"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Bezig met verzenden van RCPT TO..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Bezig met verzenden van DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Bezig met verzenden van bericht (%d / %d bytes)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr ""
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Bezig met verzenden van bericht"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "Er is een fout opgetreden bij het verzenden."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6825,12 +6821,12 @@ msgstr ""
 "Er is een fout opgetreden bij het verzenden:\n"
 "%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 #, fuzzy
 msgid "Can't connect to SMTP server."
 msgstr "Kan niet verbinden met de NNTP-server: %s:%d\n"
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, fuzzy, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Kan niet verbinden met de NNTP-server: %s:%d\n"
@@ -6855,70 +6851,70 @@ msgstr "Resultaat van handtekeningcontrole"
 msgid "Checking signature"
 msgstr "Bezig met verifiëren handtekening"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s van \"%s\""
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Geen hadtekening gevonden"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Goedgekeurde handtekening van \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Correcte handtekening"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Geldige ondertekening maar de sleutel voor \"%s\" wordt niet vertrouwd"
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Geldige ondertekening (onbetrouwbare sleutel)"
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr "Geldige maar verlopen ondertekening voor \"%s\""
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 msgid "Signature valid but expired"
 msgstr "Handtekening geldig maar verlopen"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr "Geldige ondertekening maar de sleutel voor \"%s\" is verlopen"
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr "Geldige ondertekening maar de sleutel is verlopen"
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr "Geldige ondertekening maar de sleutel voor \"%s\" is herroepen"
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr "Geldige ondertekening maar de sleutel is verlopen"
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "SLECHTE handtekening van \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "FOUTIEVE handtekening"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "Geen publieke key om de handtekening te verifiëren"
 
@@ -7015,7 +7011,7 @@ msgstr "Lijst avn nieuwsgroepen wordt opgehaald..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan geen nieuwsgroep opvragen."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Klaar."
 
@@ -7144,220 +7140,220 @@ msgstr "Sommige markeringen zijn nog aanwezig. Verwerken?"
 msgid "Scanning folder (%s)..."
 msgstr "Bezig met inlezen van map (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 msgid "_Search again"
 msgstr "_Opnieuw zoeken"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Geen ongelezen berichten meer"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "Geen ongelezen berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Geen ongelezen berichten."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "Geen ongelezen berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Geen nieuwe berichten meer"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "Geen nieuw bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Geen nieuwe berichten."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "Geen nieuwe berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Geen gemarkeerde berichten meer"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "Geen gemarkeerd bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Geen gemarkeerde berichten."
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "Geen gemarkeerd bericht gevonden. Zoeken vanaf het begin?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Geen gelabelde berichten meer"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "Geen gelabeld bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Geen gelabelde berichten."
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Geen gelablede berichten gevonden. Zoeken vanaf het begin?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Berichten worden aangetrokken op onderwerp..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d verwijderd"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verplaatst"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ","
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d gekopieerd"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr "item(s) geselecteerd"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Lijst wordt gesorteerd..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\t"
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Samenvatting wordt ingesteld van berichtinformatie..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Samenvattingbuffer wordt weggeschreven (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Bericht %d is gemarkeerd\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Bericht %d is gemarkeerd als 'wordt gelezen'.\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Bericht %d is gemarkeerd als ongelezen\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Bericht %s/%d staat klaar om verwijderd te worden\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Verwijder bericht(en)"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr ""
 "Wilt u dit bericht / deze berichten werkelijk verwijderen uit de prullenbak?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Bezig met verwijderen van dubbele berichten..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Bericht %s/%d is gedemarkeerd\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Bericht %d staat klaar om verplaatst te worden naar %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Selecteer map"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Bericht %d staat klaar om gekopieerd te worden naar %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 msgid "Destination for copy is same as current folder."
 msgstr "Doel voor kopiëren is gelijk aan de huidige map."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Selecteer map"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 msgid "Error occurred while processing messages."
 msgstr "Fout bij het verwerken van de berichten."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Discussies worden bij elkaar gevoegd..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Discussies worden uit elkaar gehaald..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Bezig met filteren (%d / %d)..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Er zijn %d berichten gefilterd."
@@ -7447,35 +7443,41 @@ msgstr "Berichten uit de wachtrij ver_zenden"
 msgid "E_xit"
 msgstr "A_fsluiten"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "Geen hadtekening gevonden"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "Serverinformatie"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "er draait al een Sylpheed.\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "kan het bestand met markeringen niet openen\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "g_thread is niet ondersteunt door glib\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "Te importeren bestand:"
 
diff --git a/po/pl.po b/po/pl.po
index 5aed759c..8c9b910f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+0900\n"
 "PO-Revision-Date: 2008-06-17 22:25+0100\n"
 "Last-Translator: Jan Stępień <jstepien@users.sourceforge.net>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -15,227 +15,227 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Odczyt ustawień wszystkich kont...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 "Połączenie IMAP4 z %s zostało przerwane. Ponowne nawiązywanie połączenia...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr ""
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "tworzenie połączenia IMAP4 do %s:%d ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "Nie można uruchomić sesji TLS\n"
 
-#: libsylph/imap.c:1176
-#, c-format
-msgid "Getting message %d"
+#: libsylph/imap.c:1230
+#, fuzzy, c-format
+msgid "Getting message %u"
 msgstr "Pobieranie wiadomości %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Dodawanie wiadomości do %s (%d / %d)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Przenoszenie wiadomości %s do %s"
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiowanie wiadomości %s do %s"
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, c-format
 msgid "Removing messages %s"
 msgstr "Usuwanie wiadomości %s"
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nie można ustawić flag skasowany: %s\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "nie można zlikwidować\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Usuwanie wszystkich wiadomości w %s"
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nie można ustawić flagi skasowany: 1:*\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "nie można zamknąć katalogu\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "brak głównego katalogu %s\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "wystąpił błąd podczas przy pobieraniu LIST.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "nie można utworzyć \"%s\"\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "nie można utworzyć \"%s\" w INBOX\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nie można utworzyć skrzynki: błąd LIST.\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "nie można utworzyć skrzynki\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, 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:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "nie można skasować skrzynki\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "nie można pobrać koperty\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Pobieranie nagłówków wiadomości (%d/%d)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "nie można pobrać koperty\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "wystąpił błąd podczas pobierania koperty.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "nie można przetworzyć koperty: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, 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:2714
+#: libsylph/imap.c:2863
 #, 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:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "nie można pobrać przestrzeni nazw\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nie można wybrać katalogu: %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 msgid "error on imap command: STATUS\n"
 msgstr "błąd polecenia IMAP: STATUS\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "Błąd uwierzytelniania IMAP4.\n"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "Nie można zalogować się do serwera IMAP4.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nie można dołączyć %s do %s\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(wysyłanie pliku...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nie można dołączyć wiadomości do %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nie można skopiować %s do %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, 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:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: CLOSE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, 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:4326
+#: libsylph/imap.c:4526
 #, 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"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "nie można zapisać do pliku tymczasowego\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Pobieranie wiadomości z %s do %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "nie można odczytać pliku mbox.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "niepoprawny format mbox: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "uszkodzona skrzynka: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "nie można otworzyć pliku tymczasowego\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -244,66 +244,62 @@ msgstr ""
 "znaleziono \"unescaped\" From:\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "nie można utworzyć pliku lock %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "jeśli to możliwe, należy użyć \"flock\" zamiast \"file\".\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "nie można utworzyć %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "skrzynka jest kontrolowana przez inny proces, oczekiwanie...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "nie można zablokować %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "nieprawidłowy typ blokady\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "nie można odblokować %s\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "nie można skrócić do zera.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Eksportowanie wiadomości z %s do %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, 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:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "Nie można otworzyć pliku zaznaczeń.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "katalog źródłowy jest taki sam jak docelowy.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopiowanie wiadomości %s/%d do %s ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -312,7 +308,7 @@ msgstr ""
 "Plik \"%s\" już istnieje.\n"
 "Nie można utworzyć katalogu."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -324,78 +320,78 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "tworzenie połączenia NNTP z %s:%d ...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 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:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "artykuł %d został już zapamiętany.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "pobieranie artykułu %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "nie można odczytać artykułu %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "nie można wysłać artykułu.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "nie można odebrać artykułu %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "nie można wybrać grupy: %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "niepoprawny zakres artykułu: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "brak nowych artykułów.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "pobieranie xover %d - %d w %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "nie można pobrać xover\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "błąd podczas pobierania xover.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "niepoprawna linia xover: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "nie można pobrać xhdr\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "błąd podczas pobierania xhdr.\n"
 
@@ -452,27 +448,27 @@ msgstr "POP3: Usuwanie przestarzałej wiadomości %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Pomijanie wiadomości %d (%d bajtów)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "skrzynka jest zablokowana\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "przekroczenie czasu sesji\n"
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "nie można uruchomić sesji TLS\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "wystąpił błąd podczas uwierzytelniania\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "nieobsługiwane polecenie\n"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "wystąpił błąd podczas sesji POP3\n"
 
@@ -503,16 +499,16 @@ msgstr "Filtr niechcianej poczty"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmine_get_text_content(): Błąd konwersji kodu.\n"
 
-#: libsylph/procmsg.c:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "nie można otworzyć pliku zaznaczeń\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nie można pobrać wiadomości %d\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Błędny wiersz polecenia wydruku: \"%s\"\n"
@@ -669,7 +665,7 @@ msgstr ""
 "Nowe wiadomości zostaną sprawdzone w tej kolejności. Zaznacz\n"
 "w kolumnie \"G\" konta, które mają być sprawdzone przez 'Odbierz wsz.'"
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -810,7 +806,7 @@ msgstr "Dodaj do książki adresowej"
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Uwagi"
@@ -819,28 +815,28 @@ msgstr "Uwagi"
 msgid "Select Address Book Folder"
 msgstr "Wybierz katalog książki adresowej"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Plik"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_Plik/Nowa _książka"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_Plik/Nowy _vCard"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/_Plik/Nowy _J-Pilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 msgid "/_File/New _LDAP Server"
 msgstr "/_Plik/Nowy serwer _LDAP"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -848,100 +844,100 @@ msgstr "/_Plik/Nowy serwer _LDAP"
 msgid "/_File/---"
 msgstr "/_Plik/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_Plik/_Edycja"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_Plik/_Usuń"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_Plik/Zapi_sz"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Plik/_Zamknij"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Edycja"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Edycja/_Kopiuj"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Edycja/_Wstaw"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/_Plik/Nowy _adres"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/_Plik/Nowa _grupa"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/_Plik/Nowy _katalog"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/_Adres/_Edycja"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usuń"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Narzędzia"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Plik/Importuj plik _LDIF"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Narzędzia/Importuj plik _CSV"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Pomo_c"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Nowy _adres"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Nowa _grupa"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Nowy _katalog"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -954,79 +950,85 @@ msgstr "/Nowy _katalog"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Usuń"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 msgid "/_Copy"
 msgstr "/_Kopiuj"
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 msgid "/_Paste"
 msgstr "/_Wklej"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "Adres e-mail"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Książka adresowa"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Katalog"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "Adres e-mail"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Do:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Ukryta kopia:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Wyszukaj"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 msgid "_Close"
 msgstr "_Zamknij"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Usuń adres(y)"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Czy naprawdę chcesz usunąć ten adres(y)?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1036,36 +1038,36 @@ msgstr ""
 "Jeśli usuniesz tylko katalog, adresy zostaną przeniesione do nadrzędnego "
 "katalogu."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "_Folder only"
 msgstr "_Tylko katalog"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "Folder and _addresses"
 msgstr "Katalog i _adresy"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Czy naprawdę usunąć \"%s\" ?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Nowy użytkownik, nie można było zapisać pliku indeksu."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Nowy użytkownik, nie można było zapisać plików książki adresowej."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Konwersja starej książki adresowej została zakończona pomyślnie."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1073,7 +1075,7 @@ msgstr ""
 "Stara książka adresowa została skonwertowana,\n"
 "nie można było zapisać nowego pliku indeksu adresów."
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1081,7 +1083,7 @@ msgstr ""
 "Nie można było skonwertować książki adresowej,\n"
 "utworzono puste pliki nowej książki adresowej."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1089,7 +1091,7 @@ msgstr ""
 "Nie można było skonwertować książki adresowej,\n"
 "nie można było utworzyć nowych plików książki adresowej."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1097,92 +1099,86 @@ msgstr ""
 "Nie można było skonwertować książki adresowej\n"
 "oraz utworzyć nowych plików książki adresowej."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 msgid "Address book conversion error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 msgid "Address book conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 msgid "Address Book Error"
 msgstr "Błąd książki adresowej"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Nie można odczytać książki adresowej"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Stara książka adresowa została skonwertowana, nie można było zapisać nowego "
 "pliku indeksów adresowych."
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Nie można było skonwertować książki adresowej lecz utworzono puste pliki "
 "nowej książki adresowej."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Nie można było skonwertować książki adresowej oraz utworzyć nowych plików "
 "książki adresowej."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Nie można było skonwertować książki adresowej i utworzyć nowych plików "
 "książki adresowej"
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 msgid "Address Book Conversion Error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 msgid "Address Book Conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Interfejs"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Książka adresowa"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Grupa"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Katalog"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "Serwer LDAP"
 
@@ -1194,15 +1190,15 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Notatka"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Błąd"
 
@@ -1245,7 +1241,7 @@ msgstr "Brązowy"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Brak"
 
@@ -1577,8 +1573,8 @@ msgstr "Wiadomość: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Nie można pobrać części wiadomości wieloczęściowej."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Bez tematu)"
 
@@ -1768,7 +1764,7 @@ msgstr "typ MIME"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Rozmiar"
 
@@ -2008,12 +2004,12 @@ msgstr "Edytuj katalog"
 msgid "Input the new name of folder:"
 msgstr "Podaj nową nazwę katalogu:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Nowy katalog"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Podaj nazwę nowego katalogu:"
 
@@ -2159,7 +2155,7 @@ msgstr "Eksport"
 msgid "Specify source folder and destination file."
 msgstr "Określ docelowy plik ze skrzynką oraz docelowy katalog."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Format daty"
@@ -2174,7 +2170,7 @@ msgstr "Katalog źródłowy:"
 msgid "Destination:"
 msgstr "Katalog docelowy:"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2186,7 +2182,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Wybierz... "
@@ -2246,23 +2242,23 @@ msgstr "Śmietnik"
 msgid "Drafts"
 msgstr "Szablony"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "Nowy katalog"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' nie może wystąpić w nazwie katalogu."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalog '%s' już istnieje."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nie można utworzyć katalog '%s'."
@@ -2388,31 +2384,31 @@ msgstr "Sprawdzanie nowych wiadomości we wszystkich katalogach..."
 msgid "Junk"
 msgstr "Niechciane"
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Wybrano katalog %s\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pobieranie wiadomości z %s..."
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Pobrać wszystkie wiadomości z \"%s\"?"
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 msgid "Download all messages"
 msgstr "Pobierz wszystkie wiadomości"
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Błąd podczas pobierania wiadomości z `%s'."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2422,26 +2418,26 @@ msgstr ""
 "(jeśli ma zostać utworzony katalog w celu przechowywania\n"
 "innych wiadomości, należy dołączyć \"/\" na końcu nazwy)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Wprowadź nową nazwę dla '%s' :"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Zmień nazwę katalogu"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Nie można zmienić nazwy katalogu \"%s\"."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nie można przenieść katalogu \"%s\"."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2450,11 +2446,11 @@ msgstr ""
 "Czy na pewno usunąć folder wyszukiwania \"%s\" ?\n"
 "Wiadomości nie zostaną usunięte."
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 msgid "Delete search folder"
 msgstr "Usuń katalog wyszukiwania"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2467,20 +2463,20 @@ msgstr ""
 "\n"
 "Czy na pewno chcesz je usunąć?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 msgid "Delete all messages in the trash folder?"
 msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2489,34 +2485,34 @@ msgstr ""
 "Czy naprawdę usunąć skrzynkę \"%s\" ?\n"
 "(Wiadomości NIE zostaną usunięte z dysku)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "Usuń skrzynkę"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto IMAP4 \"%s\" ?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "Usuń konto IMAP4"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Czy naprawdę chcesz usunąć grupę dyskusyjną \"%s\"?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Usuń grupę dyskusyjną"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto grup dyskusyjnych \"%s\"?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Usuń konto grup dyskusyjnych"
 
@@ -2528,8 +2524,8 @@ msgstr "Grupy dyskusyjne:"
 msgid "Creating header view...\n"
 msgstr "Tworzenie widoku nagłówków...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Bez Od)"
 
@@ -2541,71 +2537,71 @@ msgstr "Tworzenie widoku obrazu...\n"
 msgid "Can't load the image."
 msgstr "Nie można załadować obrazu."
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Plik %s nie istnieje."
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Określ docelowy plik ze skrzynką oraz docelowy katalog."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Importuj"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Wystąpił błąd podczas publikowania\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Importuj"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Określ docelowy plik ze skrzynką oraz docelowy katalog."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Katalog źródłowy:"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Katalog docelowy:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nowy katalog"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Określ docelowy plik ze skrzynką oraz docelowy katalog."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Wybierz importowany plik"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Wybierz importowany plik"
 
@@ -2760,142 +2756,142 @@ msgstr "Importuj plik LDIF do książki adresowej"
 msgid "Attributes"
 msgstr "Atrybuty"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nowe wiadomości"
 
-#: src/inc.c:477
+#: src/inc.c:478
 msgid "Authenticating with POP3"
 msgstr "Uwierzytelnianie POP3"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Pobieranie nowych wiadomości"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "Oczekiwanie"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Anulowano"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Pobieranie"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Gotowe (%d wiadomośći (%s) odebrano)"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Brak nowych wiadomości"
 
-#: src/inc.c:708
+#: src/inc.c:715
 #, fuzzy
 msgid "Done"
 msgstr "Gotowe."
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Błąd połączenia"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Błąd autoryzacji"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Zablokowano"
 
-#: src/inc.c:730
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Opóźnienie"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Zakończono (%d nowe wiadomości)"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Zakończono (brak nowych wiadomości)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "Wystąpiły błędy podczas pobierania poczty."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "pobieranie nowych wiadomości z konta %s ...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Uwierzytelnianie POP3"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Pobieranie nowych wiadomości"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Nawiązywanie połączenia z serwerem POP3: %s..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nie można nawiązać połączenia z serwerem POP3: %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Uwierzytelnianie..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Pobieranie wiadomości z %s..."
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Pobieranie liczby nowych wiadomości (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Pobieranie liczby nowych wiadomości (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Pobieranie liczby nowych wiadomości (UIDL)"
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Pobieranie rozmiaru wiadomości (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "Usuwanie wiadomości %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Wychodzenie"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Pobieranie wiadomości (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2904,15 +2900,15 @@ msgstr ""
 "niepowodzeniem.\n"
 "Sprawdź ustawienia filtrów niechcianej poczty."
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 msgid "Connection failed."
 msgstr "Błąd połączenia."
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2921,29 +2917,29 @@ msgstr ""
 "Błąd podczas przetwarzania wiadomości:\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Brak miejsca na dysku."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "Nie można zapisać pliku."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "Błąd gniazda."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Połączenie zamknięte przez zdalny komputer."
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "Skrzynka jest zablokowana."
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2952,11 +2948,11 @@ msgstr ""
 "Skrzynka jest zablokowana:\n"
 "%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Błąd uwierzytelniania."
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2965,15 +2961,15 @@ msgstr ""
 "Błąd uwierzytelniania:\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Sesja wygasła."
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "Odbieranie anulowano\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Pobieranie wiadomości z %s do %s...\n"
@@ -2987,24 +2983,20 @@ msgstr "Wprowadź hasło dla %s na %s:"
 msgid "Input password"
 msgstr "Wprowadź hasło"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Dziennik protokołu"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "Bibltioteka glib nie obsługuje wywołania g_thread.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Użycie: %s [OPCJE]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]      otwiera okno tworzenia wiadomości"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3014,23 +3006,23 @@ msgstr ""
 "                         otwiera okno tworzenia wiadomości z plikami,\n"
 "                         które mają zostać dołączone"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              odbiera nowe wiadomości"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          odbiera nowe wiadomości dla wszystkich kont"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 wysyła wszystkie skolejkowane wiadomości"
 
-#: src/main.c:542
+#: src/main.c:554
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [katalog]...    pokazuje łączną liczbę wiadomości"
 
-#: src/main.c:543
+#: src/main.c:555
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3038,47 +3030,47 @@ msgstr ""
 "  --status-full [katalog]...\n"
 "                         pokazuje łączną liczbę wiadomości"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open folderid/msgnum otwórz wiadomość w nowym oknie"
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir dirname    podaj katalog, który zawiera pliki konfiguracyjne"
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:550
+#: src/main.c:562
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 zakończ Sylpheed"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                tryb debugowania"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 wyświetla tę pomoc i wychodzi"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr ""
 "  --version              wyświetla informację o wersji i kończy działanie"
 
-#: src/main.c:557
+#: src/main.c:569
 #, c-format
 msgid "Press any key..."
 msgstr "Wciśnij dowolny klawisz..."
 
-#: src/main.c:638
+#: src/main.c:694
 msgid "Filename encoding"
 msgstr "Kodowanie nazwy pliku"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3092,19 +3084,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "Tworzenie nowej wiadomości. Czy zakończyć?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Skolejkowane wiadomości"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Niektóre niewysłane wiadomości zostały skolejkowane. Czy wyjść?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3112,16 +3104,20 @@ msgstr ""
 "Program GnuPG nie jest poprawnie zainstalowany, lub jego\n"
 "wersja jest zbyt stara. Obsługa OpenPGP została wyłączona."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "Jest już uruchomiona kopia programu Sylpheed.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 msgid "Migration of configuration"
 msgstr "Migracja ustawień"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3772,8 +3768,8 @@ msgstr "Tworzenie głównego okna...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Okno główne: błąd alokacji kolorów %d\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "gotowe.\n"
 
@@ -4013,7 +4009,7 @@ msgstr "Załączniki"
 msgid "Message View - Sylpheed"
 msgstr "Widok wiadomości - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nie można zapisać pliku \"%s\"."
@@ -6139,19 +6135,19 @@ msgstr "Załącznik"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Temat"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Data"
 
@@ -6161,7 +6157,7 @@ msgid "Number"
 msgstr "Numer"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 #, fuzzy
 msgid "To"
 msgstr "Do:"
@@ -6463,30 +6459,30 @@ msgstr "znaleziono %d wiadomości.\n"
 msgid "%d messages found."
 msgstr "znaleziono %d wiadomości.\n"
 
-#: src/query_search.c:579
-#, fuzzy, c-format
-msgid "Searching %s ..."
-msgstr "Przeszukiwanie katalogu %s ..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtowanie..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, fuzzy, c-format
+msgid "Searching %s ..."
+msgstr "Przeszukiwanie katalogu %s ..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Bez daty)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Zapisz w katalogu szablonów"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr "Miejsce:"
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 #, fuzzy
 msgid "Folder name:"
 msgstr "Nazwa pliku"
@@ -6537,7 +6533,7 @@ msgstr "\t\tvel \"%s\"\n"
 msgid "Signature made at %s\n"
 msgstr "Podpis wykonano %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Błąd podczas sprawdzania podpisu"
 
@@ -6566,7 +6562,7 @@ msgstr "O programie"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Usuń skrzynkę"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "Nr"
 
@@ -6592,58 +6588,58 @@ msgid ""
 "%s"
 msgstr "wystąpił błąd podczas sesji POP3\n"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Pobieranie nagłówków wiadomości (%d/%d)"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Pobieranie liczby nowych wiadomości (STAT)..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 #, fuzzy
 msgid "No message"
 msgstr "Brak nowych wiadomości"
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Usuń wiadomość"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Wychodzenie..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Pobieranie nowych wiadomości"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Wyślij wiadomość"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Pobieranie nowych wiadomości"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Pobieranie wiadomości z %s..."
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 #, fuzzy
 msgid "Delete messages"
 msgstr "Usuń wiadomość"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6722,67 +6718,67 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Łączenie z serwerem SMTP: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 #, fuzzy
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Błąd podczas wysyłania polecenia\n"
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "Wysyłanie HELO..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "Uwierzytelnianie"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 msgid "Sending message..."
 msgstr "Wysyłanie wiadomości..."
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "Wysyłanie EHLO..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Wysyłanie MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Wysyłanie"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Wysyłanie RCPT TO..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Wysyłanie DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Wysyłanie wiadomości (%d / %d)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr ""
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Wysyłanie wiadomości"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "Błąd podczas wysyłania wiadomości."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6791,12 +6787,12 @@ msgstr ""
 "Błąd podczas wysyłania wiadomości:\n"
 ".%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 #, fuzzy
 msgid "Can't connect to SMTP server."
 msgstr "Nie można połączyć się z serwerem NNTP: %s:%d\n"
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, fuzzy, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Nie można połączyć się z serwerem NNTP: %s:%d\n"
@@ -6823,70 +6819,70 @@ msgstr "Wyniku sprawdzenia podpisu"
 msgid "Checking signature"
 msgstr "Sprawdzanie podpisu"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s od \"%s\""
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Nie znaleziono podpisu"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Poprawny podpis od \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Poprawny podpis"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Poprawny podpis, ale klucz dla \"%s\" nie jest zaufany"
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Poprawny podpis (niezaufany klucz)"
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, fuzzy, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr "Poprawny lecz przeterminowany podpis dla \"%s\""
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 msgid "Signature valid but expired"
 msgstr "Podpis poprawny, ale stracił ważność"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr "Podpis poprawny, ale klucz dla \"%s\" stracił ważność"
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr "Podpis poprawny, ale klucz stracił ważność"
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr "Podpis poprawny, ale klucz dla \"%s\" został unieważniony"
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr "Podpis poprawny, ale klucz został unieważniony"
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "NIEPOPRAWNY podpis od \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "ZŁY podpis"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "Brak klucza publicznego dla sprawdzenia podpisu"
 
@@ -6992,7 +6988,7 @@ msgstr "Nie można pobrać listy grup dyskusyjnych."
 msgid "Can't retrieve newsgroup list."
 msgstr "Nie można pobrać listy grup dyskusyjnych."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Gotowe."
 
@@ -7128,236 +7124,236 @@ msgstr "brak niektórych znaczników, czy wykonać ?"
 msgid "Scanning folder (%s)..."
 msgstr "Skanowanie katalogu (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 #, fuzzy
 msgid "_Search again"
 msgstr "Szukaj ponownie"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Nie ma więcej nieprzeczytanych wiadomości"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr ""
 "Nie znaleziono nieprzeczytanych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od końca?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Brak nieprzeczytanych wiadomości."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Nie znaleziono nieprzeczytanych wiadomości.\n"
 "Czy przejść do następnego folderu?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Nie ma więcej nowych wiadomości"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr ""
 "Nie znaleziono nowych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od końca?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Brak nowych wiadomości"
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr ""
 "Nie znaleziono nowych wiadomości.\n"
 "Czy przejść do następnego folderu?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Nie ma więcej zaznaczonych wiadomości"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr ""
 "Nie znaleziono zaznaczonych wiadomości.\n"
 "Czy rozpoczać wyszukiwanie od końca?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Brak zaznaczonych wiadomości"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr ""
 "Nie znaleziono zaznaczonych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od początku?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Nie ma więcej etykietowanych wiadomości"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr ""
 "Nie znaleziono etykietowanych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od końca?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Brak etykietowanych wiadomości."
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr ""
 "Nie znaleziono etykietowanych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od początku?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Łączenie wiadomości wg tematu..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d usunięto"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d przeniesiono"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopiowano"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " element(ów) wybrany(o)"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nowych, %d nieprzeczytanych, razem %d (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nowych, %d nieprzeczytanych, %d razem"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Sortowanie podsumowania..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tUstawianie podsumowania z danych wiadomości..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Ustawianie podsumowania z danych wiadomości..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisywanie cache podsumowania (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Wiadomość %d zaznaczona\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Wiadomość %d zaznaczona jako przeczytana\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Wiadomość %d zaznaczona jako nieprzeczytana\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Wiadomość %s/%d ustawiona do usunięcia\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Usuń wiadomość"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Czy naprawdę chcesz usunąć wiadomości z kosza?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Kasowanie powielonych wiadomości..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Wiadomość %s/%d niezaznaczona\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Wiadomość %d ustawiona do przesunięcia do %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "Katalog docelowy taki sam jak bieżący."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Wybierz katalog"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Wiadomość %d ustawiona do kopiowania do %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 msgid "Destination for copy is same as current folder."
 msgstr "Katalog docelowy kopiowania jest taki sam jak bieżący."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Wybierz katalog"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 msgid "Error occurred while processing messages."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Tworzenie wątków..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Odwątkowanie .."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "filtrowanie..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d wiadomość(i) przefiltrowano."
@@ -7459,36 +7455,42 @@ msgstr "Wyślij wiadomości z kolejki"
 msgid "E_xit"
 msgstr "Koniec programu"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Dawny Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "Nie znaleziono podpisu"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "Informacje o serwerze"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "Jest już uruchomiona kopia programu Sylpheed.\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "Nie można otworzyć pliku zaznaczeń.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "Bibltioteka glib nie obsługuje wywołania g_thread.\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "Importowanie pliku:"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6b06cb1a..8c5366e4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+0900\n"
 "PO-Revision-Date: 2009-07-14 12:28-0400\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
@@ -26,226 +26,226 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Lendo as configurações de cada conta...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "A conexão IMAP4 com %s terminou. Reconectando...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "servidor IMAP4 desabilita LOGIN.\n"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "criando conexão IMAP4 com %s:%d ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "Não foi possível iniciar sessão TLS.\n"
 
-#: libsylph/imap.c:1176
-#, c-format
-msgid "Getting message %d"
+#: libsylph/imap.c:1230
+#, fuzzy, c-format
+msgid "Getting message %u"
 msgstr "Buscando mensagem %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Adicionando mensagens em %s (%d / %d)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Movendo mensagens %s para %s ..."
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiando mensagesn %s para %s ..."
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, c-format
 msgid "Removing messages %s"
 msgstr "Removendo mensagens %s"
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "não posso marcar como apagado: %s\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "não posso eliminar\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Removendo todas as mensagens em %s"
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 msgid "can't set deleted flags: 1:*\n"
 msgstr "não posso marcar como apagado: 1:*\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "não posso fechar pasta\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "pasta raiz %s inexistente\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "erro recebendo resultados do LIST.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Não foi possível criar '%s'\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "não foi possível criar '%s' sob a Caixa de Entrada\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "não posso criar caixa de correio: LIST falhou\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "não posso criar caixa de correio\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, 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:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "não posso apagar caixa de correio\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "Não foi possível obter o 'envelope'\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Buscando cabeçalhos das mensagens (%d / %d)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "Não foi possível obter o 'envelope'\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "Ocorreu um erro ao obter 'envelope'\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, 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:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, 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:2714
+#: libsylph/imap.c:2863
 #, 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:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "Não foi possível obter o 'envelope'\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "não posso selecionar pasta: %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 msgid "error on imap command: STATUS\n"
 msgstr "erro no comando imap: STATUS\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "Falha na autenticação IMAP4.\n"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "Falha ao logar no servidor IMAP4.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, 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:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(enviando arquivo...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, 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:3969
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "não posso copiar %s para %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erro no comando imap: STORE %s %s\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "erro no comando imap: CLOSE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, 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:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "o iconv não pode converter %s para UTF-7\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "não é possível gravar no arquivo temporário\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Obtendo Mensagens de %s até %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "não foi possível ler o arquivo mbox.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "formato de mbox inválido: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "mbox corrompida: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "não foi possível abrir o arquivo temporário\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -254,66 +254,62 @@ msgstr ""
 "Encontrado De sem codificar:\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "não foi possível criar o arquivo de trava %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "usar 'flock' em vez de 'file' se for possível.\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "não foi possível criar %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "o correio está sendo usado por outro processo, aguardando...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "não foi possível travar %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "tipo de trava inválido\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "não foi possível destravar %s\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "não foi possível zerar o mailbox.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportando mensagens de %s em %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, 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:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "Não foi possível abrir o arquivo de marcas.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "pastas de origem e destino são idênticas.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copiando mensagem %s/%d para %s ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -322,7 +318,7 @@ msgstr ""
 "O arquivo `%s' já existe.\n"
 "Não foi possível criar a pasta."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -341,77 +337,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "criando conexão NNTP com %s:%d ...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 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:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "o artigo %d já está no cache.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "obtendo artigo %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "não foi possível ler o artigo %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "não posso postar artigo.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "não foi possível obter o artigo %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "não foi possível selecionar o grupo: %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "intervalo de artigos inválido: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "não há novos artigos.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obtendo xover %d - %d en %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "não foi possível obter xover\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "ocorreu um erro ao obter xover.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "linha xover inválida: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "não foi possível obter xover\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "ocorreu um erro ao obter xover.\n"
 
@@ -468,27 +464,27 @@ msgstr "POP3: Apagando mensagem expirada %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Pulando mensagem %d (%d bytes)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "a caixa de correio está travada\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "tempo limite da sessão\n"
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "não foi possível iniciar sessão TLS\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "ocorreu um erro na autenticação\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "comando não suportado\n"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "Erro na sessão POP3\n"
 
@@ -519,16 +515,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:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "não foi possível abrir o arquivo de marcas\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "não posso obter mensagem %d\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "O comando de impressão é inválido: `%s'\n"
@@ -683,7 +679,7 @@ msgstr ""
 "Mensagens novas serão baixadas nessa ordem. Marque as caixas\n"
 "na coluna `G' para habilitar essa caixa no `Baixar tudo'."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -824,7 +820,7 @@ msgstr "Adicionar ao Catálogo de Endereços"
 msgid "Address"
 msgstr "Endereço"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Notas"
@@ -833,28 +829,28 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Selecione Pasta do Catálogo de Endereços"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Arquivo"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_Arquivo/Novo _Livro"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_Arquivo/Novo _vCard"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/_Arquivo/Novo _JPilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 msgid "/_File/New _LDAP Server"
 msgstr "/_Arquivo/Novo Servidor _LDAP"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -862,100 +858,100 @@ msgstr "/_Arquivo/Novo Servidor _LDAP"
 msgid "/_File/---"
 msgstr "/_Arquivo/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_Arquivo/_Editar"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_Arquivo/_Apagar"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_Arquivo/_Salvar"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Arquivo/_Fechar"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/C_opiar"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/Co_lar"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/_Endereço"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/_Endereço/Novo _Endereço"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/_Endereço/Novo _Grupo"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/_Endereço/Nova _Pasta"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/_Endereço/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/_Endereço/_Editar"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/_Apagar"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar arquivo _LDIF"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Ferramentas/Importar arquivo _CSV"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_juda"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_juda/_Sobre"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Novo _Endereço"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Novo _Grupo"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Nova _Pasta"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -968,79 +964,85 @@ msgstr "/Nova _Pasta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Apagar"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 msgid "/_Copy"
 msgstr "/_Copiar"
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 msgid "/_Paste"
 msgstr "/Co_lar"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "Endereço de e-mail"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Catálogo de endereços"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Pasta"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "Endereço de e-mail"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Cco:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Apagar"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Procurar"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 msgid "_Close"
 msgstr "_Fechar"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Apagar endereço(s)"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Apagar realmente o(s) endereço(s)?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1049,37 +1051,37 @@ msgstr ""
 "Você quer apagar a pasta E todos os endereços em `%s' ?\n"
 "Caso apague somente a pasta, os endereços serão movidos para a pasta pai."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Apagar pasta"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "_Folder only"
 msgstr "_Pasta apenas"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "Folder and _addresses"
 msgstr "Pasta e _endereços"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Apagar realmente `%s' ?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Novo usuário, não foi possível salvar arquivo de índice."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr ""
 "Novo usuário, não foi possível salvar arquivos do catálogo de endereços."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Catálogo de endereços antigo convertido com sucesso."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1087,7 +1089,7 @@ msgstr ""
 "Catálogo de endereços antigo convertido,\n"
 "não foi possível salvar o arquivo de índice de endereços "
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1095,7 +1097,7 @@ msgstr ""
 "Não foi possível converter o catálogo de endereços,\n"
 "mas arquivos vazios para o catálogo de endereços foram criados."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1103,7 +1105,7 @@ msgstr ""
 "Não foi possível converter o catálogo de endereços,\n"
 "não foi possível criar arquivos novos para o catálogo de endereços."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1111,92 +1113,86 @@ msgstr ""
 "Não foi possível converter o catálogo de endereços\n"
 "nem criar arquivos novos para o catálogo de endereços."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 msgid "Address book conversion error"
 msgstr "Erro convertendo catálogo de endereços"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 msgid "Address book conversion"
 msgstr "Conversão do catálogo de endereços"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 msgid "Address Book Error"
 msgstr "Erro no Catálogo de Endereços"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Não foi possível ler o índice do endereço"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Catálogo de endereços antigo convertido, mas não foi possível salvar o "
 "arquivo de indíce do novo"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Não foi possível converter o catálogo de endereços, mas arquivos vazios para "
 "o catálogo de endereços foram criados."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Não foi possível converter o catálogo de endereços, não foi possível criar "
 "arquivos novos para o catálogo de endereços."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Não foi possível converter o catálogo de endereços e não foi possível criar "
 "arquivos novos para o catálogo de endereços."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 msgid "Address Book Conversion Error"
 msgstr "Erro na conversão do catálogo de endereços"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 msgid "Address Book Conversion"
 msgstr "Conversão do Catálogo de Endereços"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Catálogo de Endereços"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Pessoa"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Grupo"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Pasta"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1208,15 +1204,15 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Notificação"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Erro"
 
@@ -1259,7 +1255,7 @@ msgstr "Marrom"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Nenhuma"
 
@@ -1590,8 +1586,8 @@ msgstr "Mensagem: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Não foi possível obter alguma(s) parte(s) dessa mensagem."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
@@ -1783,7 +1779,7 @@ msgstr "Tipo MIME"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Tamanho"
 
@@ -2024,12 +2020,12 @@ msgstr "Editar pasta"
 msgid "Input the new name of folder:"
 msgstr "Nome da nova pasta:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 
@@ -2177,7 +2173,7 @@ msgstr "Exportar"
 msgid "Specify source folder and destination file."
 msgstr "Especifique o arquivo mbox e a pasta de destino."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Formato de data"
@@ -2192,7 +2188,7 @@ msgstr "Diretório fonte:"
 msgid "Destination:"
 msgstr "Diretório de destino:"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2204,7 +2200,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "Selecionar..."
@@ -2264,23 +2260,23 @@ msgstr "Lixeira"
 msgid "Drafts"
 msgstr "Rascunhos"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "NovaPasta"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' não pode ser usado no nome da pasta."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "A pasta `%s' já existe."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "não foi possível criar a pasta `%s'."
@@ -2405,31 +2401,31 @@ msgstr "Checar novas mensagens em todas as pastas..."
 msgid "Junk"
 msgstr "Spam"
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pasta %s selecionada\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Recebendo mensagens em %s ..."
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Baixar todas as mensagens abaixo de '%s' ?"
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 msgid "Download all messages"
 msgstr "Baixar todas as mensagens"
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Erro ao receber mensagens em `%s'."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2439,26 +2435,26 @@ msgstr ""
 "(se você quer criar uma pasta para armazenar subpastas.\n"
 " adicione `/' no final do nome)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Renomear pasta"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Não foi possível renomear a pasta '%s'."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Não foi possível mover a pasta `%s'."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2467,11 +2463,11 @@ msgstr ""
 "Apagar a pasta de busca '%s' ?\n"
 "As mensagens reais não serão apagadas."
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 msgid "Delete search folder"
 msgstr "Apagar pasta de busca"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2484,20 +2480,20 @@ msgstr ""
 "\n"
 "Quer realmente apagá-las?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Não foi possível excluir a pasta `%s'."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Esvaziar lixeira"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 msgid "Delete all messages in the trash folder?"
 msgstr "Apagar todas as mensagens da lixeira?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2506,34 +2502,34 @@ msgstr ""
 "Realmente remover a caixa de correio `%s' ?\n"
 "(As mensagens NÃO são apagadas do disco)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "Remover caixa de correio"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Realmente apagar conta IMAP4 `%s' ?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "Apagar conta IMAP4"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Apagar grupo de notícias"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Apagar conta de grupo de notícias"
 
@@ -2545,8 +2541,8 @@ msgstr "Grupos de notícias:"
 msgid "Creating header view...\n"
 msgstr "Criando visualizador de cabeçalhos...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Sem remetente)"
 
@@ -2558,71 +2554,71 @@ msgstr "Criando visualizador de imagem...\n"
 msgid "Can't load the image."
 msgstr "Não foi possível carregar a imagem."
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "O arquivo %s não existe."
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Especifique o arquivo mbox e a pasta de destino."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Procurando %s ..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Importar"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Revisando pasta %s ..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Ocorreu um erro quando postando\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Importar"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Especifique o arquivo mbox e a pasta de destino."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Diretório fonte:"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Diretório de destino:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nova pasta"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Especifique o arquivo mbox e a pasta de destino."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Selecionar arquivo a importar"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Selecionar arquivo a importar"
 
@@ -2777,141 +2773,141 @@ msgstr "Importar arquivo LDIF para o Catálogo de Endereços"
 msgid "Attributes"
 msgstr "Atributos"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d novas mensagens"
 
-#: src/inc.c:477
+#: src/inc.c:478
 msgid "Authenticating with POP3"
 msgstr "Autenticando via POP3"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Obtendo novas mensagens"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "Aguardando"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, c-format
 msgid "%d message(s) (%s) received"
 msgstr "%d mensagen(s) (%s) recebida(s)"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, c-format
 msgid "no new messages"
 msgstr "não há mensagens novas"
 
-#: src/inc.c:708
+#: src/inc.c:715
 msgid "Done"
 msgstr "Concluído"
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Conexão falhou"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Autenticação falhou"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Travado"
 
-#: src/inc.c:730
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Tempo limite"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Concluído (%d nova(s) mensagem(ns))"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Concluído (Não há mensagens novas)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "Alguns erros aconteceram ao baixar os emails."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obtendo novas mensagens da conta %s...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Autenticando via POP3"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando novas mensagens"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando ao servidor POP3: %s..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Não foi possível se conectar ao servidor POP3: %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Recebendo mensagens de %s..."
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtendo o número de novas mensagens (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtendo o número de novas mensagens (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtendo o número de novas mensagens (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o número de novas mensagens (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "Apagando mensagem %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Saindo"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Baixando mensagem (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2919,15 +2915,15 @@ msgstr ""
 "Execução do filtro de spam falhou.\n"
 "Por favor verifique as definições do filtro de spam."
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 msgid "Connection failed."
 msgstr "Falha na conexão"
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "Ocorreu um erro enquanto as mensagens eram processadas."
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2936,29 +2932,29 @@ msgstr ""
 "Erro ao processar mensagens:\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Não há espaço disponível no disco."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "Não foi possível gravar o arquivo."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "erro de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Conexão remota finalizada pela estação remota."
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "Caixa de correio está travada."
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2967,11 +2963,11 @@ msgstr ""
 "Caixa de correio está trancada:\n"
 "%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2980,15 +2976,15 @@ msgstr ""
 "Falha de autenticação:\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Tempo limite da sessão."
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "Incorporação cancelada\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obtendo novas mensagens de %s até %s...\n"
@@ -3002,24 +2998,20 @@ msgstr "Insira a senha para %s em %s:"
 msgid "Input password"
 msgstr "Informe a senha"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Log do protocolo"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread não é suportada pela glib.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPÇÃO]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [endreço]    abre janela de composição"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3029,23 +3021,23 @@ msgstr ""
 "                         abrir a janela de composição com os arquivos\n"
 "                         especificados anexados"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recebe novas mensgens"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recebe novas mensagens de todas as contas"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envia todas as mensagens da fila"
 
-#: src/main.c:542
+#: src/main.c:554
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [pasta]...   mostra o número total de mensagens"
 
-#: src/main.c:543
+#: src/main.c:555
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3053,47 +3045,47 @@ msgstr ""
 "  --status-full [pasta]...\n"
 "                         exibe o status de cada pasta"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open pasta/número abre a mensagem 'número' em uma nova janela"
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir diretório    especifica o diretório que armazena os arquivos "
 "de configuração"
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "  --ipcport porta        número da porta para comandos remotos via IPC"
 
-#: src/main.c:550
+#: src/main.c:562
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 sair do Sylpheed"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo debug"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 exibe esta ajuda e sai"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              mostra informação de versão e sai"
 
-#: src/main.c:557
+#: src/main.c:569
 #, c-format
 msgid "Press any key..."
 msgstr "Pressione qualquer tecla..."
 
-#: src/main.c:638
+#: src/main.c:694
 msgid "Filename encoding"
 msgstr "Codificação de nome de arquivo"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3117,19 +3109,19 @@ msgstr ""
 "\n"
 "Continuar?"
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "Ainda há mensagens sendo escritas. Deseja sair?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Mensagens enviadas para a fila"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Algumas mensagens não enviadas estão na fila. Sair agora?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3137,16 +3129,20 @@ msgstr ""
 "GnuPG não está instalado adequadamente.\n"
 "Suporte a OpenPGP desabilitado."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "outra cópia do Sylpheed já está sendo executada.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 msgid "Migration of configuration"
 msgstr "Migração da configuração"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3790,8 +3786,8 @@ msgstr "Criando janela principal...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: falhou ao alocar cores %d\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "Pronto.\n"
 
@@ -4049,7 +4045,7 @@ msgstr "Anexos"
 msgid "Message View - Sylpheed"
 msgstr "Visualização da Mensagem - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Não foi possível salvar arquivo `%s'."
@@ -6105,19 +6101,19 @@ msgstr "Anexo"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Assunto"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "De"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Data"
 
@@ -6127,7 +6123,7 @@ msgid "Number"
 msgstr "Número"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 msgid "To"
 msgstr "Para"
 
@@ -6411,29 +6407,29 @@ msgstr "1 mensagem encontrada."
 msgid "%d messages found."
 msgstr "%d mensagens encontradas."
 
-#: src/query_search.c:579
-#, c-format
-msgid "Searching %s ..."
-msgstr "Procurando %s ..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Procurando %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, c-format
+msgid "Searching %s ..."
+msgstr "Procurando %s ..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Sem data)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 msgid "Save as search folder"
 msgstr "Salvar como pasta de busca"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr "Local:"
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 msgid "Folder name:"
 msgstr "Nome da pasta:"
 
@@ -6479,7 +6475,7 @@ msgstr "\t\taka \"%s\"\n"
 msgid "Signature made at %s\n"
 msgstr "Assinatura feita em %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Erro verificando a assinatura"
 
@@ -6504,7 +6500,7 @@ msgstr "_Sobre"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - Caixa de mensagens remota POP3"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "Nº"
 
@@ -6531,55 +6527,55 @@ msgstr ""
 "Erro na sessão POP3:\n"
 "%s"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Buscando cabeçalhos das mensagens (%d / %d) ..."
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 msgid "Getting the number of messages..."
 msgstr "Obtendo o número de novas mensagens..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 msgid "No message"
 msgstr "Não há mensagens"
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, c-format
 msgid "Deleted %d messages"
 msgstr "%d mensagem(s) apagadas"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Saindo..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, c-format
 msgid "Retrieved %d messages"
 msgstr "%d mensagem(s) recebidas"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, c-format
 msgid "Opened message %d"
 msgstr "Mensagem %d aberta"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, c-format
 msgid "Retrieved %d message headers"
 msgstr "%d cabeçalho(s) recebidos"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, c-format
 msgid "Retrieving message %d ..."
 msgstr "Recebendo mensagem %d ..."
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 msgid "Delete messages"
 msgstr "Apagar mensagens"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6662,66 +6658,66 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Conectando com o servidor SMTP: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Erro após enviar comando QUIT (ignorado)"
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 msgid "Sending message..."
 msgstr "Enviando mensagem..."
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Enviando"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Enviando DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando mensagem (%d / %d bytes)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr "%d / %d bytes"
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Enviando mensagem"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "Ocorreu um erro ao enviar suas mensagens."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6730,11 +6726,11 @@ msgstr ""
 "Erro ao enviar a mensagem:\n"
 "%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 msgid "Can't connect to SMTP server."
 msgstr "Não foi possível conectar ao SMTP."
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Não foi possível conectar ao servidor SMTP: %s:%d"
@@ -6759,70 +6755,70 @@ msgstr "Resultado da verificação de assinatura"
 msgid "Checking signature"
 msgstr "Checando assinatura"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s de \"%s\""
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Assinatura não encontrada"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correta de \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Assinatura correta"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Assinatura válida mas a chave para \"%s\" não é confiável"
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Assinatura válida (chave desconfiável)"
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr "Assinatura válida mas expirada para \"%s\""
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 msgid "Signature valid but expired"
 msgstr "Assinatura válida mas expirada"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr "Assinatura válida mas a chave para \"%s\" expirou"
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr "Assinatura válida mas a chave expirou"
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr "Assinatura válida mas a chave para \"%s\" foi revogada"
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr "Assinatura válida mas a chave foi revogada"
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INVÁLIDA de \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "Assinatura INVÁLIDA"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "Sem chave pública para verificar a assinatura"
 
@@ -6925,7 +6921,7 @@ msgstr "Recebendo lista de newsgroups..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Não foi possível obter a lista de grupos de notícias."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Feito."
 
@@ -7052,217 +7048,217 @@ msgstr "Algumas marcas foram deixadas. Processá-las?"
 msgid "Scanning folder (%s)..."
 msgstr "Revisando pasta (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 msgid "_Search again"
 msgstr "Procurar _novamente"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Não há mais mensagens não lidas"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "Nenhuma mensagens não lidas encontrada. Procurar a partir do fim?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Não há mensagens não lidas."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "Não há mensagens não lidas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Não há mais mensagens novas"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "Nenhuma mensagens nova encontrada. Procurar a partir do fim?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Não há mensagens novas."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "Não há mensagens novas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Não há mais mensagens marcadas"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "Não foram encontradas mensagens marcadas. Procurar a partir do fim?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Não há mensagens marcadas"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "Não foram encontradas mensagens marcadas. Procurar a partir do início?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Não há mais mensagens etiquetadas"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "Não foram encontradas mensagens etiquetadas. Procurar a partir do fim?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Não há mensagens etiquetadas."
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nenhuma mensagem não lida encontrada. Procurar do início ?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensagens por assunto..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d apagadas"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidas"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiadas"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " item(ns) selecionado(s)"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novas, %d não lidas, %d  no total (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novas, %d não lidas, %d no total"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Ordenando resumos..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tConfigurando resumo a partir dos dados das mensagens..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Configurando resumo a partir dos dados das mensgens..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Gravando cache de resumo (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensagem %d marcada\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensagem %d marcada como sendo lida\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensagem %d marcada como não lida\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensagem %s/%d marcada para deleção\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Apagar a(s) mensagem(s)"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Quer realmente apagar a(s) mensagem(s) da lixeira?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Apagando mensagens duplicadas..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensagem %s/%d está desmarcada\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensagem %d marcada para ser movida para %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "O destino é o mesmo que a pasta atual."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 msgid "Select folder to move"
 msgstr "Selecione a pasta a ser movida"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensagem %d está marcada para ser copiada para %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 msgid "Destination for copy is same as current folder."
 msgstr "O destino para cópia é o mesmo que a pasta atual."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 msgid "Select folder to copy"
 msgstr "Selecione a pasta a ser copiada"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 msgid "Error occurred while processing messages."
 msgstr "Erro ao processar mensagens."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Construindo a hierarquia..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Desfazendo a hierarquia..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando (%d / %d)..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mensagem(ns) foram filtradas."
@@ -7353,11 +7349,11 @@ msgstr "_Enviar mensagens da fila"
 msgid "E_xit"
 msgstr "Sai_r"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
@@ -7365,22 +7361,28 @@ msgstr ""
 "Existe uma versão nova do Sylpheed.\n"
 "Atualizar agora?"
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 msgid "New version found"
 msgstr "Nova versão encontrada"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 msgid "Information"
 msgstr "Informação"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 msgid "Sylpheed is already the latest version."
 msgstr "Sylpheed está devidamente atualizado."
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr "Não foi possível obter a informação sobre versão."
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "Não foi possível abrir o arquivo de marcas.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "g_thread não é suportada pela glib.\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "Importando arquivo:"
 
diff --git a/po/ro.po b/po/ro.po
index ab177bb9..36185f84 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+0900\n"
 "PO-Revision-Date: 2008-12-05 03:06+0200\n"
 "Last-Translator: Cristian Secară <cristi AT secarica DOT ro>\n"
 "Language-Team: \n"
@@ -20,234 +20,234 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Citire configurări pentru fiecare cont...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Conexiunea IMAP4 la %s a fost întreruptă. Reconectare...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Serverul IMAP4 dezactivează LOGIN.\n"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "creare conexiune IMAP4 la %s:%d ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "Nu se poate porni sesiunea TLS.\n"
 
-#: libsylph/imap.c:1176
-#, c-format
-msgid "Getting message %d"
+#: libsylph/imap.c:1230
+#, fuzzy, c-format
+msgid "Getting message %u"
 msgstr "Obținere mesaj %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Adăugare mesaje la %s (%d / %d)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Mutare mesaje %s la %s ..."
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiere mesaje %s la %s ..."
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, c-format
 msgid "Removing messages %s"
 msgstr "Ștergere mesaje %s"
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nu se pot seta fanioanele de ștergere: %s\n"
 
 # hm ?
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "nu se poate elimina\n"
 
 # hm ? din sau în ?
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Ștergere mesaje din %s"
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nu se pot seta fanioanele de ștergere: 1:*\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "nu se poate închide dosarul\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "dosarul root %s nu există\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "a apărut o eroare în timpul obțineriii „LIST”.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Nu se poate crea „%s”\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Nu se poate crea „%s” în INBOX\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nu se poate crea căsuța poștală: LIST a eșuat.\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "nu se poate crea căsuța poștală\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nu se poate redenumi căsuța poștală: %s în %s\n"
 
-#: libsylph/imap.c:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "nu se poate șterge căsuța poștală\n"
 
-# hm ? envelope conform wikipedia
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "nu se poate obține „envelope” (informația de routing)\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Obținere anteturi mesaje (%d / %d)"
 
 # hm ? envelope conform wikipedia
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "nu se poate obține „envelope” (informația de routing)\n"
+
+# hm ? envelope conform wikipedia
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr ""
 "a apărut o eroare în timpul obținerii „envelope” (informația de routing).\n"
 
 # hm ? envelope conform wikipedia
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "„envelope” (informația de routing) nu poate fi analizată: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nu se poate efectua conexiunea la serverul IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2714
+#: libsylph/imap.c:2863
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nu se poate stabili sesiunea IMAP4 cu: %s:%d\n"
 
 # hm ?
-#: libsylph/imap.c:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "nu se poate obține spațiul de nume\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nu se poate selecta dosarul: %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 msgid "error on imap command: STATUS\n"
 msgstr "eroare la comanda IMAP: STATUS\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autentificarea IMAP4 a eșuat.\n"
 
 # hm ? cu ce diferă de authentication ?
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificarea IMAP4 a eșuat.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nu se poate adăuga %s la %s\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(trimitere fișier...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nu se poate adăuga mesajul la %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nu se poate copia %s la %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "eroare în timpul comenzii IMAP: STORE:%s %s\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "eroare în timpul comenzii IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "eroare în timpul comenzii IMAP: CLOSE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nu poate efectua conversia UTF-7 la %s\n"
 
-#: libsylph/imap.c:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nu poate efectua conversia %s la UTF-7\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "nu se poate scrie în fișierul temporar\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Obținere mesaje de la %s în %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "nu se poate citi fișierul mbox.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "formatul mbox nu este valid: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "mbox malformat: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "nu se poate deschide fișierul temporar\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -256,66 +256,62 @@ msgstr ""
 "a fost găsit câmp From „unescaped”:\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "nu se poate crea fișierul „lock” %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "dacă este posibil, folosiți „flock” în loc de „file”.\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "nu se poate crea %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "căsuța poștală este folosită de alt proces, așteaptați...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "nu se poate bloca %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "tipul de blocare nu este valid\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "nu se poate debloca %s\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "nu se poate trunchia la zero căsuța poștală.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportare mesaje din %s în %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "nu se poate copia mesajului %s în %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "Nu se poate deschide fișierul de marcaj.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "dosarul sursă este identic cu cel de destinație.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copiere mesaj %s/%d în %s ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -324,7 +320,7 @@ msgstr ""
 "Fișierul „%s” există deja.\n"
 "Nu se poate crea dosarul."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -343,77 +339,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "creare conexiune NNTP la %s:%d ...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 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:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "Articolul %d a fost deja memorat în cache.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "obținere articol %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "nu se poate citi articolul %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "nu se poate trimite articolul.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "nu se poate recepționa articolul %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "nu se poate selecta grupul: %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "intervalul de articol nu este valid: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "nu sunt articole noi.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obținere xover %d - %d în %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "nu se poate obține xover\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "a apărut o eroare în timpul obținerii „xover”.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "linia xover nu este validă: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "nu se poate obține xhdr\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "a apărut o eroare în timpul obținerii „xhdr”.\n"
 
@@ -470,27 +466,27 @@ msgstr "POP3: Ștergere mesaje expirate %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Se omite mesajul %d (%d octeți)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "căsuța poștală este blocată\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "timpul sesiunii a expirat\n"
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "nu se poate porni sesiunea TLS\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "a apărut o eroare la autentificare\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "comandă nesuportată\n"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "a apărut o eroare la sesiunea POP3\n"
 
@@ -521,16 +517,16 @@ msgstr "Filtru mesaj spam"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): conversia codului a eșuat.\n"
 
-#: libsylph/procmsg.c:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "nu se poate deschide fișierul de marcaj\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nu se poate prelua mesajul %d\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Linia de comandă pentru tipărire nu este validă: „%s”\n"
@@ -688,7 +684,7 @@ msgstr ""
 "coloana „G”\n"
 "pentru a activa recepționarea mesajelor la comanda „Verifică tot”."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -838,7 +834,7 @@ msgstr "Adăugare în agendă"
 msgid "Address"
 msgstr "Agendă"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Observații"
@@ -847,28 +843,28 @@ msgstr "Observații"
 msgid "Select Address Book Folder"
 msgstr "Selectați dosarul pentru agendă"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fișier"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_Fișier/A_gendă nouă"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_Fișier/_vCard nou"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/_Fișier/_JPilot nou"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fișier/Server _LDAP nou"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -876,101 +872,101 @@ msgstr "/_Fișier/Server _LDAP nou"
 msgid "/_File/---"
 msgstr "/_Fișier/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_Fișier/_Editare"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_Fișier/Ș_terge"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_Fișier/_Salvează"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fișier/În_chide"
 
 # comun și în main menu și în rmb agendă
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editare"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editare/_Copiază"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Editare/Li_pește"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/A_dresă"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/A_dresă/_Adresă nouă"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/A_dresă/_Grup nou"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/A_dresă/_Dosar nou"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/A_dresă/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/A_dresă/_Editare"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/A_dresă/Ș_terge"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Unelte"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Unelte/Importă un fișier _LDIF"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Unelte/Importă un fișier _CSV"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ajutor"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ajutor/_Despre"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/_Adresă nouă"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/_Grup nou"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/_Dosar nou"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -984,80 +980,86 @@ msgid "/---"
 msgstr "/---"
 
 # comun și la intrare în agendă și la rmb pe mesaj
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/Șter_ge"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 msgid "/_Copy"
 msgstr "/_Copiază"
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 msgid "/_Paste"
 msgstr "/Li_pește"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "Adresă de e-mail"
-
 # tooltip peste butonul Agendă
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Agendă"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Dosar"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "Adresă de e-mail"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr " Nume:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Către:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Șterge"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Adaugă"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Căutare"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 msgid "_Close"
 msgstr "În_chide"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Ștergere adresă (adrese)"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Sigur doriți să ștergeți adresa (adresele) ?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1066,36 +1068,36 @@ msgstr ""
 "Vreți să ștergeți dosarul ȘI toate adresele din „%s” ?\n"
 "Dacă ștergeți doar dosarul, adresele vor fi mutate în dosarul părinte."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Ștergere dosar"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "_Folder only"
 msgstr "Doar _dosar"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "Folder and _addresses"
 msgstr "Dosar și _adrese"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Sigur doriți să ștergeți „%s” ?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Utilizator nou, fișierul index nu a putut fi salvat."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Utilizator nou, fișierele agendei nu au putut fi salvate."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Agenda veche a fost convertită cu succes."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1103,7 +1105,7 @@ msgstr ""
 "Agenda veche a fost convertită, dar\n"
 "fișierul index al noii agende nu a putut fi salvat."
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1111,7 +1113,7 @@ msgstr ""
 "Agenda nu a putut fi convertită, dar\n"
 "au fost create fișierele noi de agendă goală."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1119,7 +1121,7 @@ msgstr ""
 "Agenda nu a putut fi convertită, iar\n"
 "fișierele noi de agendă nu au putut fi create."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1127,92 +1129,86 @@ msgstr ""
 "Agenda nu a putut fi convertită\n"
 "și fișierele noi de agendă nu au putut fi create."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 msgid "Address book conversion error"
 msgstr "Eroare de conversie a agendei"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 msgid "Address book conversion"
 msgstr "Conversie agendă"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 msgid "Address Book Error"
 msgstr "Eroare agendă"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Fișierul index al agendei nu a putut fi citit"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Agenda veche a fost convertită, iar fișierul index al noii agende nu a putut "
 "fi salvat."
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Agenda nu a putut fi convertită, dar au fost create fișierele noi de agendă "
 "goală."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Agenda nu a putut fi convertită, iar fișierele noi de agendă nu au putut fi "
 "create."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Agenda nu a putut fi convertită și fișierele noi de agendă nu au putut fi "
 "create."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 msgid "Address Book Conversion Error"
 msgstr "Eroare de conversie a agendei"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 msgid "Address Book Conversion"
 msgstr "Conversie agendă"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Interfață"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Agendă"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Persoană"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "Adresă de e-mail"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Grupă"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Dosar"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1224,15 +1220,15 @@ msgstr "Adrese comune:"
 msgid "Personal address"
 msgstr "Adrese personale:"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Notificare"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Avertisment"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Eroare"
 
@@ -1277,7 +1273,7 @@ msgstr "Maro"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Niciunul"
 
@@ -1611,8 +1607,8 @@ msgstr "Mesaj: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Nu se poate obține o parte a mesajului multiparte."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Fără subiect)"
 
@@ -1807,7 +1803,7 @@ msgstr "Tip MIME"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Dimensiune"
 
@@ -2049,12 +2045,12 @@ msgstr "Editare dosar"
 msgid "Input the new name of folder:"
 msgstr "Introduceți noul nume al dosarului:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Dosar nou"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Introduceți numele dosarului nou:"
 
@@ -2204,7 +2200,7 @@ msgstr "Export"
 msgid "Specify source folder and destination file."
 msgstr "Specificați fișierul mbox sursă și dosarul destinație."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Format dată"
@@ -2219,7 +2215,7 @@ msgstr "Director sursă:"
 msgid "Destination:"
 msgstr "Director destinație:"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2231,7 +2227,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Selectare... "
@@ -2291,23 +2287,23 @@ msgstr "Gunoi"
 msgid "Drafts"
 msgstr "Ciorne"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "Dosar nou"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "„%c” nu poate fi inclus în numele dosarului."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Dosarul „%s” există deja."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Dosarul „%s” nu a putut fi creat."
@@ -2441,32 +2437,32 @@ msgstr "Verifică pentru mesaje noi în toate dosarele..."
 msgid "Junk"
 msgstr "Spam"
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Este selectat dosarul %s\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Descărcare mesaje în %s ..."
 
 # hm ?
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Descărcați toate mesajele din „%s” ?"
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 msgid "Download all messages"
 msgstr "Descarcă toate mesajele"
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "A apărut o eroare în timpul descărcării mesajelor în „%s”."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2476,26 +2472,26 @@ msgstr ""
 "(dacă vreți să creați un dosar care să conțină subdosare,\n"
 " adăugați „/” la sfârșitul numelui)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Introduceți noul nume pentru „%s”:"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Redenumește dosarul"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Nu se poate redenumi dosarul „%s”."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nu se poate muta dosarul „%s”."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2504,11 +2500,11 @@ msgstr ""
 "Ștergeți dosarul de căutare „%s” ?\n"
 "Mesajele reale NU sunt șterse de pe disc."
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 msgid "Delete search folder"
 msgstr "Șterge dosarul pentru căutare"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2521,20 +2517,20 @@ msgstr ""
 "\n"
 "Chiar vreți să ștergeți ?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nu se poate șterge dosarul „%s”."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Golire gunoi"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 msgid "Delete all messages in the trash folder?"
 msgstr "Ștergeți toate mesajele din dosarul de gunoi ?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2543,34 +2539,34 @@ msgstr ""
 "Sigur doriți să eliminați căsuța poștală „%s” ?\n"
 "(Mesajele NU sunt șterse de pe disc)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "Ștergere căsuță poștală"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Sigur doriți să ștergeți contul IMAP4 „%s” ?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "Ștergere cont IMAP4"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Sigur doriți să ștergeți grupul de știri „%s” ?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Ștergere grup de știri"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Sigur doriți să ștergeți contul de știri „%s” ?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Ștergere cont de știri"
 
@@ -2582,8 +2578,8 @@ msgstr "Grupuri de știri:"
 msgid "Creating header view...\n"
 msgstr "Creare vizualizare antet...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Fără expeditor)"
 
@@ -2595,73 +2591,73 @@ msgstr "Creare vizualizare imagine...\n"
 msgid "Can't load the image."
 msgstr "Imaginea nu a putut fi încărcată."
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Fișierul %s nu există."
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Specificați fișierul mbox sursă și dosarul destinație."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Căutare %s ..."
 
 # titlu la import mbox
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Import"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Scanare dosar %s ..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "A apărut o eroare în timpul trimiterii\n"
 
 # titlu la import mbox
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Import"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Specificați fișierul mbox sursă și dosarul destinație."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Director sursă:"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Director destinație:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Dosar nou"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Specificați fișierul mbox sursă și dosarul destinație."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Selectați fișierul de importat"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Selectați fișierul de importat"
 
@@ -2819,141 +2815,141 @@ msgstr "Import de fișier LDIF în agendă"
 msgid "Attributes"
 msgstr "Atribute"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d mesaje noi"
 
-#: src/inc.c:477
+#: src/inc.c:478
 msgid "Authenticating with POP3"
 msgstr "Autentificare cu POP3"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Recepționare mesaje noi"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "Așteptare"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Anulat"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Recepționare"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, c-format
 msgid "%d message(s) (%s) received"
 msgstr "%d mesaj(e) (%s) primit(e)"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, c-format
 msgid "no new messages"
 msgstr "nu sunt mesaje noi"
 
-#: src/inc.c:708
+#: src/inc.c:715
 msgid "Done"
 msgstr "Gata"
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Conexiunea a eșuat"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Autentificarea a eșuat"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Blocat"
 
-#: src/inc.c:730
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Timp expirat"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Terminat (%d mesaj(e) noi)"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Terminat (nu sunt mesaje noi)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "Au apărut unele erori în timpul obținerii mail-ului."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obținere mesaje noi pentru contul %s...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Autentificare cu POP3"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: recepționare mesaje noi"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectare la serverul POP3: %s ..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nu se poate efectua conexiunea la serverul POP3: %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentificare..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Recepționare mesaje de la %s..."
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obținerea numărului de mesaje noi (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obținerea numărului de mesaje noi (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obținerea numărului de mesaje noi (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obținerea dimensiunii mesajelor (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "Ștergere mesaje %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Părăsire"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recepționare mesaje (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2961,15 +2957,15 @@ msgstr ""
 "Execuția comenzii filtrului de spam a eșuat.\n"
 "Verificați setările controlului de spam."
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 msgid "Connection failed."
 msgstr "Conexiunea a eșuat"
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "A apărut o eroare în timpul procesării mail-ului."
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2978,29 +2974,29 @@ msgstr ""
 "A apărut o eroare în timpul procesării mail-ului.\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Nu mai este spațiu pe disc."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "Nu se poate scrie fișierul."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "Eroare socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Conexiune închisă de serverul de la distanță."
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "Căsuța poștală este blocată"
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3009,11 +3005,11 @@ msgstr ""
 "Căsuța poștală este blocată:\n"
 "%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Autentificarea a eșuat."
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3022,15 +3018,15 @@ msgstr ""
 "Autentificarea a eșuat:\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Timpul sesiunii a expirat."
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "Încorporarea a fost anulată\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obținere mesaje noi de la %s în %s...\n"
@@ -3044,24 +3040,20 @@ msgstr "Introduceți parola pentru %s pe %s:"
 msgid "Input password"
 msgstr "Introduceți parola"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Log protocol"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread nu este suportat de glib.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilizare: %s [OPȚIUNE]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    deschide fereastra de compoziție"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3071,23 +3063,23 @@ msgstr ""
 "                         deschide fereastra de compoziție cu fișierele\n"
 "                         specificate atașate"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              primește mesaje noi"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          primește mesaje noi pentru toate conturile"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 trimite toate mesajele din coada de așteptare"
 
-#: src/main.c:542
+#: src/main.c:554
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [folder]...   arată numărul total de mesaje"
 
-#: src/main.c:543
+#: src/main.c:555
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3095,48 +3087,48 @@ msgstr ""
 "  --status-full [folder]...\n"
 "                         arată starea fiecărui dosar"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open folderid/msgnum deschide mesajul în fereastră nouă"
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir dirname    specifică directorul care conține fișierele de "
 "configurare"
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 "  --ipcport portnum      specifică portul pentru comenzi la distanță IPC"
 
-#: src/main.c:550
+#: src/main.c:562
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 ieșire Sylpheed"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                mod debug"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 afișează acest ajutor și ieși"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              afișează versiunea și ieși"
 
-#: src/main.c:557
+#: src/main.c:569
 #, c-format
 msgid "Press any key..."
 msgstr "Apăsați orice tastă..."
 
-#: src/main.c:638
+#: src/main.c:694
 msgid "Filename encoding"
 msgstr "Codare de nume fișier"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3161,24 +3153,24 @@ msgstr ""
 "Continuați ?"
 
 # hm ? sigur cu \n
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr ""
 "Există cel puțin un mesaj în curs de compunere.\n"
 "Sigur doriți să ieșiți ?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Mesaje în coada de așteptare"
 
 # hm ? sigur cu \n
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "În coada de așteptare se află unul sau mai multe mesaje netrimise.\n"
 "Ieșiți acum ?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3186,16 +3178,20 @@ msgstr ""
 "GnuPG nu este instalat corespunzător, sau versiunea lui este prea veche.\n"
 "Suportul pentru OpenPGP a fost dezactivat."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "rulează deja o altă sesiune Sylpheed.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 msgid "Migration of configuration"
 msgstr "Migrarea configurației"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3848,8 +3844,8 @@ msgstr "Creare fereastră principală...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fereastra principală: alocarea culorii %d a eșuat\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "gata.\n"
 
@@ -4109,7 +4105,7 @@ msgstr "Atașamente"
 msgid "Message View - Sylpheed"
 msgstr "Vizualizare mesaje - Syplheed"
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nu se poate salva fișierul „%s”."
@@ -6196,19 +6192,19 @@ msgstr "Atașament"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Subiect"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Expeditor"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Dată"
 
@@ -6218,7 +6214,7 @@ msgid "Number"
 msgstr "Număr"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 msgid "To"
 msgstr "Către"
 
@@ -6509,29 +6505,29 @@ msgstr "A fost găsit 1 mesaj."
 msgid "%d messages found."
 msgstr "Au fost găsite %d mesaje."
 
-#: src/query_search.c:579
-#, c-format
-msgid "Searching %s ..."
-msgstr "Căutare %s ..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Căutare %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, c-format
+msgid "Searching %s ..."
+msgstr "Căutare %s ..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Fără Dată)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 msgid "Save as search folder"
 msgstr "Salvează ca dosar de căutare"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr "Locație:"
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 msgid "Folder name:"
 msgstr "Nume dosar:"
 
@@ -6580,7 +6576,7 @@ msgstr "\t\taka „%s”\n"
 msgid "Signature made at %s\n"
 msgstr "Semnătură creată la %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Eroare la verificarea semnăturii"
 
@@ -6605,7 +6601,7 @@ msgstr "_Despre"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s -  Căsuță poștală POP3 la distanță"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "Nr."
 
@@ -6632,55 +6628,55 @@ msgstr ""
 "A apărut o eroare în timpul sesiunii POP3:\n"
 "%s"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Recepționare anteturi mesaje (%d / %d) ..."
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 msgid "Getting the number of messages..."
 msgstr "Obținerea numărului de mesaje..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 msgid "No message"
 msgstr "Nu sunt mesaje"
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, c-format
 msgid "Deleted %d messages"
 msgstr "A(u) fost șters(e) %d mesaj(e)"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Părăsire..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, c-format
 msgid "Retrieved %d messages"
 msgstr "A(u) fost recepționat(e) %d mesaj(e)"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, c-format
 msgid "Opened message %d"
 msgstr "A fost deschis mesajul %d"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, c-format
 msgid "Retrieved %d message headers"
 msgstr "A(u) fost recepționat(e) %d antet(uri) de mesaj"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, c-format
 msgid "Retrieving message %d ..."
 msgstr "Recepționare mesaj %d..."
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 msgid "Delete messages"
 msgstr "Ștergere mesaje"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6763,67 +6759,67 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Conectare la serverul SMTP: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "A apărut o eroare (ignorată) după comanda QUIT"
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "Trimitere HELO..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "Autentificare"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 msgid "Sending message..."
 msgstr "Trimitere mesaj..."
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "Trimitere EHLO..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Trimitere MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Trimitere"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Trimitere RCPT TO..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Trimitere DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Trimitere mesaj (%d / %d octeți)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr "%d / %d octeți"
 
 # hm ? asta este o înștiințare sau o comandă ?
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Trimitere mesaj"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "A apărut o eroare în timpul trimiterii mesajului."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6832,11 +6828,11 @@ msgstr ""
 "A apărut o eroare în timpul trimiterii mesajului:\n"
 "%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 msgid "Can't connect to SMTP server."
 msgstr "Nu se poate efectua conexiunea la serverul SMTP."
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Nu se poate efectua conexiunea la serverul SMTP: %s:%d"
@@ -6861,70 +6857,70 @@ msgstr "Rezultat verificare semnătură"
 msgid "Checking signature"
 msgstr "Verificare semnătură"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s de la „%s”"
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Nu s-a găsit nicio semnătură"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Semnătură bună de la „%s”"
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Semnătură bună"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Semnătură validă, dar cheia pentru „%s” nu este de încredere"
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Semnătură validă (cheia nu este de încredere)"
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr "Semnătură validă, dar expirată pentru „%s”"
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 msgid "Signature valid but expired"
 msgstr "Semnătură validă, dar expirată"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr "Semnătură validă, dar cheia de semnătură pentru „%s” a expirat"
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr "Semnătură validă, dar cheia de semnătură a expirat"
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr "Semnătură validă, dar cheia de semnătură pentru „%s” a fost revocată"
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr "Semnătură validă, dar cheia de semnătură a fost revocată"
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Semnătura de la „%s” NU ESTE VALIDĂ"
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "Semnătura NU ESTE VALIDĂ"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "Nu este nicio cheie publică pentru a verifica semnătura"
 
@@ -7027,7 +7023,7 @@ msgstr "Obținere listă grup de știri..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Nu se poate recepționa lista de grup de știri."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Gata."
 
@@ -7154,217 +7150,217 @@ msgstr "Au rămas unele marcaje. Doriți să fie procesate ?"
 msgid "Scanning folder (%s)..."
 msgstr "Scanare dosar (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 msgid "_Search again"
 msgstr "_Caută din nou"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Nu mai sunt mesaje necitite"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "Nu s-a găsit nici un mesaj necitit. Căutați de la sfârșit ?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Nu sunt mesaje necitite."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "Nu s-a găsit nici un mesaj necitit. Mergeți la dosarul următor ?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Nu mai sunt mesaje noi"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "Nu s-a găsit nici un mesaj nou. Căutați de la sfârșit ?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Nu sunt mesaje noi."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "Nu s-a găsit nici un mesaj nou. Mergeți la dosarul următor ?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Nu mai sunt mesaje marcate"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "Nu s-a găsit nici un mesaj marcat. Căutați de la sfârșit ?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Nu sunt mesaje marcate."
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nu s-a găsit nici un mesaj marcat. Căutați de la început ?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Nu mai sunt mesaje etichetate"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "Nu s-a găsit nici un mesaj etichetat. Căutați de la sfârșit ?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Nu sunt mesaje etichetate"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nu s-a găsit nici un mesaje etichetat. Căutați de la început ?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Atracție mesaje după subiect..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d șters(e)"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d mutat(e)"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiat(e)"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " element(e) selectat(e)"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d noi, %d necitite, %d în total (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nou(i), %d necitit(e), %d în total"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Sortare sumar..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tStabilire sumar din datele din mesaj..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Stabilire sumar din datele din mesaj..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Scriere cache sumar (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mesajul %d este marcat\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mesajul %d este marcat ca citit\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mesajul %d este marcat ca necitit\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mesajul %s/%d este marcat pentru ștergere\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Ștergere mesaj(e)"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Chiar vreți să ștergeți mesajul (mesajele) de la gunoi ?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Ștergere mesaje duplicate..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mesajul %s/%d este demarcat\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mesajul %d este marcat pentru mutare în %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "Destinația este aceeași cu dosarul curent."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 msgid "Select folder to move"
 msgstr "Selectați dosarul de mutat"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mesajul %d este setat pentru copiere în %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 msgid "Destination for copy is same as current folder."
 msgstr "Destinația pentru copiere este aceeași cu dosarul curent."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 msgid "Select folder to copy"
 msgstr "Selectați dosarul de copiat"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 msgid "Error occurred while processing messages."
 msgstr "A apărut o eroare în timpul procesării mesajelor."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Construire fire de discuție..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Distrugere fire de discuție..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrare (%d / %d)..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "filtrare..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Filtrare..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d messaj(e) au fost filtrate."
@@ -7456,35 +7452,41 @@ msgstr "_Trimite mesajele de la coadă"
 msgid "E_xit"
 msgstr "_Ieșire"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "Nu s-a găsit nicio semnătură"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "Informații despre server"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "rulează deja o altă sesiune Sylpheed.\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "Nu se poate deschide fișierul de marcaj.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "g_thread nu este suportat de glib.\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "Fișier de import:"
 
diff --git a/po/ru.po b/po/ru.po
index 234fc268..1d4e8e40 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+0900\n"
 "PO-Revision-Date: 2009-08-10 17:45+0400\n"
 "Last-Translator: Ilya Ponetayev <instenet@gmail.com>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -24,226 +24,226 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Чтение настроек учётных записей...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Соединение IMAP4 с %s прервано. Восстановление соединения...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Сервер IMAP4 запрещает использование команды LOGIN.\n"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "установление соединения IMAP4 с %s:%d ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "Не удалось начать сеанс TLS.\n"
 
-#: libsylph/imap.c:1176
-#, c-format
-msgid "Getting message %d"
+#: libsylph/imap.c:1230
+#, fuzzy, c-format
+msgid "Getting message %u"
 msgstr "Получение сообщения %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Добавление сообщений в %s (%d / %d)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Перемещение сообщений %s в %s ..."
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Копирование сообщений %s в %s ..."
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, c-format
 msgid "Removing messages %s"
 msgstr "Удаление сообщений %s"
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "не удалось установить флаг удаления: %s\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "не удалось очистить папку от удалённых сообщений\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Удаление всех сообщений из %s"
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 msgid "can't set deleted flags: 1:*\n"
 msgstr "не удалось установить флаг удаления: 1:*\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "невозможно закрыть папку\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "корневая папка %s не существует\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "произошла ошибка при получении LIST.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Ошибка при создании \"%s\"\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Ошибка при создании \"%s\" внутри INBOX\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "не удалось создать почтовый ящик: ошибка LIST\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "не удалось создать почтовый ящик\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "не удалось переименовать почтовый ящик %s в %s\n"
 
-#: libsylph/imap.c:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "не удалось удалить почтовый ящик\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "не удалось получить данные конверта\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Получение заголовков сообщений (%d / %d)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "не удалось получить данные конверта\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "ошибка при получении данных конверта.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ошибка при разборе данных конверта: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не удалось соединиться с сервером IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2714
+#: libsylph/imap.c:2863
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Не удалось открыть сеанс связи IMAP4 c %s:%d\n"
 
-#: libsylph/imap.c:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "не удалось получить пространство имён\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "невозможно выбрать папку: %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 msgid "error on imap command: STATUS\n"
 msgstr "ошибка при выполнении команды IMAP: STATUS\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "Ошибка аутентификации IMAP4.\n"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "Ошибка авторизации IMAP4.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не удалось добавить %s к %s\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(передача файла...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "не удалось добавить сообщение к %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не удалось скопировать %s в %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "ошибка при выполнении команды IMAP: STORE %s %s\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "ошибка при выполнении команды IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "ошибка при выполнении команды IMAP: CLOSE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "ошибка преобразования iconv из UTF-7 в %s\n"
 
-#: libsylph/imap.c:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "ошибка преобразования iconv из %s в UTF-7\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "ошибка записи во временный файл\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Получение сообщений из %s в %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "ошибка чтения файла mbox.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "неверный формат почтового ящика: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "испорченный почтовый ящик: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "ошибка при открытии временного файла \n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -252,66 +252,62 @@ msgstr ""
 "найдена незащищённая строка From:\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "ошибка создания файла блокировки %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "используйте \"flock\" вместо \"file\", если возможно.\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "не удалось создать %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "почтовый ящик занят другим процессом, ожидание...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "не удалось блокировать %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "Неверный тип блокировки\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "не удалось разблокировать %s\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "не удалось обрезать почтовый ящик до нуля.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Экспорт сообщений из %s в %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "не удалось скопировать сообщение %s в %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "Не удалось открыть файл пометок.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "исходная папка совпадает с папкой назначения.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Копирование сообщения %s/%d·to·%s·...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -320,7 +316,7 @@ msgstr ""
 "Файл \"%s\" уже существует.\n"
 "Нельзя создать папку с таким же именем."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -339,77 +335,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "соединение NNTP с %s:%d ...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "Потеряно соединение NNTP с %s:%d. Попытка восстановления...\n"
 
-#: libsylph/news.c:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "статья %d уже в кеше.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "получение статьи %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "ошибка чтения статьи %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "ошибка отправки статьи.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "ошибка получения статьи %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "не удалось выбрать группу: %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "неверный диапазон статей: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "новых статей нет.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "загрузка xover %d - %d в %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "не удалось загрузить xover\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "произошла ошибка при получении xover.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "неверная строка xover: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "не удалось загрузить xhdr\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "произошла ошибка при получении xhdr.\n"
 
@@ -466,27 +462,27 @@ msgstr "POP3: Удаление устаревшего сообщения %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Пропускается сообщение %d (%d байт)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "почтовый ящик занят\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "время сеанса истекло\n"
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "не удалось начать сеанс TLS\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "ошибка при аутентификации\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "команда не поддерживается\n"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "ошибка сеанса POP3\n"
 
@@ -517,16 +513,16 @@ msgstr "Фильтр спама"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Ошибка преобразования кодировки.\n"
 
-#: libsylph/procmsg.c:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "ошибка открытия файла пометок\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "не удалось получить сообщение %d\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Неправильная команда печати: \"%s\"\n"
@@ -683,7 +679,7 @@ msgstr ""
 "Пометьте в колонке \"G\" учётные записи, которые нужно проверять\n"
 "по команде \"Получить все\"."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -824,7 +820,7 @@ msgstr "Добавление адреса в книгу"
 msgid "Address"
 msgstr "Адрес"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Примечание"
@@ -833,28 +829,28 @@ msgstr "Примечание"
 msgid "Select Address Book Folder"
 msgstr "Выберите папку в адресной книге"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Файл"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/Файл/Новая книга"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/Файл/Новый файл vCard"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/Файл/Новый файл JPilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новый сервер LDAP"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -862,100 +858,100 @@ msgstr "/Файл/Новый сервер LDAP"
 msgid "/_File/---"
 msgstr "/Файл/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/Файл/Правка"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/Файл/Удалить"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/Файл/Сохранить"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Файл/Закрыть"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Правка"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Правка/Копировать"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/Правка/Вставить"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/Адрес"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/Адрес/Новый адрес"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/Адрес/Новая группа"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/Адрес/Новая папка"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/Адрес/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/Адрес/Правка"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/Адрес/Удалить"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Инструменты"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Инструменты/Импорт файла LDIF"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 msgid "/_Tools/Import _CSV file"
 msgstr "/Инструменты/Импорт файла CSV"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Справка"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Справка/О программе"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Новый адрес"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Новая группа"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Новая папка"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -968,79 +964,85 @@ msgstr "/Новая папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/Удалить"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 msgid "/_Copy"
 msgstr "/Копировать"
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 msgid "/_Paste"
 msgstr "/Вставить"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "Адрес E-Mail"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адресная книга"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Папка"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "Адрес E-Mail"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Имя:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Копия:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Скрытно:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Добавить"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Найти"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 msgid "_Close"
 msgstr "Закрыть"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Удалить адрес(а)"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Действительно удалить адрес(а)?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1049,36 +1051,36 @@ msgstr ""
 "Вы хотите удалить папку \"%s\" и все адреса в ней?\n"
 "Если удалить только папку, адреса будут перемещены в родительскую папку."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Удалить папку"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "_Folder only"
 msgstr "Только папку"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "Folder and _addresses"
 msgstr "Папку и адреса"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Действительно удалить \"%s\"?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Новый пользователь; не удалось сохранить индексный файл."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Новый пользователь; не удалось сохранить файлы адресной книги."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Старая адресная книга успешно преобразована."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1086,7 +1088,7 @@ msgstr ""
 "Старая адресная книга преобразована,\n"
 "не удалось сохранить новый индексный файл."
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1094,7 +1096,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "создана пустая адресная книга."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1102,7 +1104,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "ошибка при создании файлов адресной книги."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1110,91 +1112,85 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "кроме того, произошла ошибка при создании файлов новой адресной книги."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 msgid "Address book conversion error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 msgid "Address book conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 msgid "Address Book Error"
 msgstr "Ошибка при работе с адресной книгой"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Не удалось прочитать индекс адресов"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старая адресная книга преобразована, не удалось сохранить новый индексный "
 "файл"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, создана пустая адресная книга."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, ошибка при создании новых файлов "
 "адресной книги"
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, кроме того, произошла ошибка при "
 "создании новых файлов адресной книги."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 msgid "Address Book Conversion Error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 msgid "Address Book Conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адресная книга"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Контакт"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Группа"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Папка"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1206,15 +1202,15 @@ msgstr "Общие адреса"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Уведомление"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Ошибка"
 
@@ -1257,7 +1253,7 @@ msgstr "Коричневый"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Нет"
 
@@ -1588,8 +1584,8 @@ msgstr "Сообщение: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Ошибка при получении одного из компонентов сообщения."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Без темы)"
 
@@ -1779,7 +1775,7 @@ msgstr "Тип MIME"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Размер"
 
@@ -2020,12 +2016,12 @@ msgstr "Изменить имя папки"
 msgid "Input the new name of folder:"
 msgstr "Введите новое имя папки:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Новая папка"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Введите имя новой папки:"
 
@@ -2172,7 +2168,7 @@ msgstr "Экспорт"
 msgid "Specify source folder and destination file."
 msgstr "Укажите файл mbox и папку назначения."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Формат даты"
@@ -2187,7 +2183,7 @@ msgstr "Исходная папка:"
 msgid "Destination:"
 msgstr "Каталог назначения:"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2199,7 +2195,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Выбор... "
@@ -2259,23 +2255,23 @@ msgstr "Корзина"
 msgid "Drafts"
 msgstr "Черновики"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "НоваяПапка"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Символ \"%c\" не может входить в имя папки."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка \"%s\" уже существует."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не удалось создать папку \"%s\"."
@@ -2400,31 +2396,31 @@ msgstr "Проверка новых сообщений во всех папка�
 msgid "Junk"
 msgstr "Спам"
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папка %s выбрана\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Загружаются сообщения из %s ..."
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Загрузить все сообщения из %s ?"
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 msgid "Download all messages"
 msgstr "Загружаются все сообщения"
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Произошла ошибка при загрузке сообщений из \"%s\"."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2434,26 +2430,26 @@ msgstr ""
 "(если вы хотите создать папку для вложенных папок,\n"
 " добавьте \"/\" в конец имени)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Введите новое имя для \"%s\":"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Переименовать папку"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Не удалось переименовать папку \"%s\"."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Не удалось переместить папку \"%s\"."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2462,11 +2458,11 @@ msgstr ""
 "Удалить папку поиска \"%s\"?\n"
 "Это не приведёт к удалению сообщений."
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 msgid "Delete search folder"
 msgstr "Удалить папку поиска"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2479,20 +2475,20 @@ msgstr ""
 "\n"
 "Вы действительно хотите удалить папку?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ошибка при удалении папки \"%s\"."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Очистка корзины"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 msgid "Delete all messages in the trash folder?"
 msgstr "Удалить все сообщения из корзины?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2501,34 +2497,34 @@ msgstr ""
 "Удалить почтовый ящик \"%s\"?\n"
 "(Сообщения не будут удалены с диска)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "Удалить почтовый ящик"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Удалить учётную запись IMAP4 \"%s\"?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "Удалить учётную запись IMAP4"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Удалить группу новостей \"%s\"?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Удаление группы новостей"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Удалить учётную запись новостей \"%s\"?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Удалить учётную запись новостей"
 
@@ -2540,8 +2536,8 @@ msgstr "Группы новостей:"
 msgid "Creating header view...\n"
 msgstr "Создание области просмотра заголовков...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Без отправителя)"
 
@@ -2553,71 +2549,71 @@ msgstr "Создание области просмотра изображени�
 msgid "Can't load the image."
 msgstr "Ошибка загрузки изображения"
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Файл %s не найден"
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Укажите файл mbox и папку назначения."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Поиск в папке \"%s\"..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Импорт"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Просмотр папки %s ..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Произошла ошибка при отправке статьи\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Импорт"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Укажите файл mbox и папку назначения."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Исходная папка:"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Каталог назначения:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Новая папка"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Укажите файл mbox и папку назначения."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Выбор импортируемого файла"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Выбор импортируемого файла"
 
@@ -2770,141 +2766,141 @@ msgstr "Импорт файла LDIF в адресную книгу"
 msgid "Attributes"
 msgstr "Атрибуты"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed (новых сообщений: %d)"
 
-#: src/inc.c:477
+#: src/inc.c:478
 msgid "Authenticating with POP3"
 msgstr "Аутентификация POP3"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Получение новых сообщений"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "Ожидание"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Отменена"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Получение"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, c-format
 msgid "%d message(s) (%s) received"
 msgstr "принято сообщений: %d (%s)"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, c-format
 msgid "no new messages"
 msgstr "нет новых сообщений"
 
-#: src/inc.c:708
+#: src/inc.c:715
 msgid "Done"
 msgstr "Выполнено."
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Ошибка соединения"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Неверный пароль"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Занято"
 
-#: src/inc.c:730
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Нет ответа"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Завершено (новых сообщений: %d)"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Завершено (нет новых сообщений)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "При получении сообщений возникли ошибки."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "получение новых сообщений для учётной записи %s...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Аутентификация POP3"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Получение новых сообщений"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Соединение с сервером POP3: %s..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не удалось соединиться с сервером POP3: %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Аутентификация..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Получение сообщений с %s..."
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Получение количества новых сообщений (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Получение количества новых сообщений (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Получение количества новых сообщений (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Получение размера сообщений (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "Удаление сообщения %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Выход"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получение сообщения (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2912,15 +2908,15 @@ msgstr ""
 "Не удалось выполненить команду фильтрации спама.\n"
 "Проверьте настройки фильтрации спама."
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 msgid "Connection failed."
 msgstr "Ошибка соединения"
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "Произошла ошибка при обработке сообщений."
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2929,29 +2925,29 @@ msgstr ""
 "Произошла ошибка при обработке сообщений:\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Нет места на диске."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "Ошибка записи в файл."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "Ошибка сокета."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Сервер закрыл соединение."
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "Почтовый ящик занят."
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2960,11 +2956,11 @@ msgstr ""
 "Почтовый ящик занят:\n"
 "%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Ошибка аутентификации."
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2973,15 +2969,15 @@ msgstr ""
 "Ошибка аутентификации:\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Время сеанса истекло."
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "Приём сообщений прерван\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Получение новых сообщений из %s в %s...\n"
@@ -2995,24 +2991,20 @@ msgstr "Введите пароль для %s на %s:"
 msgid "Input password"
 msgstr "Ввод пароля"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Журнал"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread не поддерживается в glib.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Использование: %s [ПАРАМЕТР]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [адрес]      открыть окно создания сообщения"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3022,24 +3014,24 @@ msgstr ""
 "                         открыть окно создания сообщения с присоединёнными\n"
 "                         файлами"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              получить новые сообщения"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all          получить новые сообщения со всех учётных записей"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 отослать все сообщения из очереди"
 
-#: src/main.c:542
+#: src/main.c:554
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [папка]...    вывести суммарное количество сообщений"
 
-#: src/main.c:543
+#: src/main.c:555
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3047,45 +3039,45 @@ msgstr ""
 "  --status-full [папка]...\n"
 "                         вывести состояние указанных папок"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "··--open·folderid/msgnum·открыть сообщение в новом окне"
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr "  --configdir каталог    указать каталог с файлами конфигурации"
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "··--ipcport·portnum······задать портдля удаленной команды IPC"
 
-#: src/main.c:550
+#: src/main.c:562
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 завершить работу Sylpheed"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                режим отладки"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 отобразить это описание и выйти"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              вывести информацию о версии и выйти"
 
-#: src/main.c:557
+#: src/main.c:569
 #, c-format
 msgid "Press any key..."
 msgstr "Нажмите любую клавишу..."
 
-#: src/main.c:638
+#: src/main.c:694
 msgid "Filename encoding"
 msgstr "Кодировка имён файлов"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3109,19 +3101,19 @@ msgstr ""
 "\n"
 "Продолжить?"
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "Есть редактируемое сообщение. Выходить?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Сообщения в очереди"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "В очереди есть неотправленные сообщения. Выходить?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3129,16 +3121,20 @@ msgstr ""
 "GnuPG установлен неправильно, или установлена устаревшая версия.\n"
 "Поддержка OpenPGP отключена."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "другая копия Sylpheed уже запущена.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 msgid "Migration of configuration"
 msgstr "Импорт предыдущей конфигурации"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3782,8 +3778,8 @@ msgstr "Создание главного окна...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Главное окно: проблема с цветом %d\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "выполнено.\n"
 
@@ -4042,7 +4038,7 @@ msgstr "Вложения"
 msgid "Message View - Sylpheed"
 msgstr "Окно сообщения - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ошибка при сохранении файла \"%s\"."
@@ -6098,19 +6094,19 @@ msgstr "Вложение"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "От"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Дата"
 
@@ -6120,7 +6116,7 @@ msgid "Number"
 msgstr "Номер"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 msgid "To"
 msgstr "Кому"
 
@@ -6404,29 +6400,29 @@ msgstr "Найдено одно сообщение."
 msgid "%d messages found."
 msgstr "Найдено %d сообщений."
 
-#: src/query_search.c:579
-#, c-format
-msgid "Searching %s ..."
-msgstr "Поиск в папке \"%s\"..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Поиск в папке \"%s\" (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, c-format
+msgid "Searching %s ..."
+msgstr "Поиск в папке \"%s\"..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Нет даты)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 msgid "Save as search folder"
 msgstr "Сохранить как папку поиска"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr "Размещение:"
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 msgid "Folder name:"
 msgstr "Имя папки:"
 
@@ -6472,7 +6468,7 @@ msgstr "\tдругое имя \"%s\"\n"
 msgid "Signature made at %s\n"
 msgstr "Подпись создана %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Ошибка проверки подписи"
 
@@ -6497,7 +6493,7 @@ msgstr "О программе"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - POP3 удаленный почтовый ящик"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "Номер"
 
@@ -6524,55 +6520,55 @@ msgstr ""
 "Ошибка сеанса POP3:\n"
 "%s"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Получение заголовков сообщений (%d / %d)"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 msgid "Getting the number of messages..."
 msgstr "Получение количества новых сообщений (STAT)..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 msgid "No message"
 msgstr "Нет новых сообщений."
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, c-format
 msgid "Deleted %d messages"
 msgstr "Удалено %d сообщений"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Завершение..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, c-format
 msgid "Retrieved %d messages"
 msgstr "Получено %d сообщений"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, c-format
 msgid "Opened message %d"
 msgstr "Открыть сообщение %d"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, c-format
 msgid "Retrieved %d message headers"
 msgstr "Получено %d заголовков сообщений"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, c-format
 msgid "Retrieving message %d ..."
 msgstr "Получение сообщений с %d..."
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 msgid "Delete messages"
 msgstr "Удаление сообщений"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6655,66 +6651,66 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Соединение с сервером SMTP: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Произошла ошибка после команды.QUIT (игнорируется)"
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "Передача HELO..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "Аутентификация"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 msgid "Sending message..."
 msgstr "Отправка сообщения..."
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "Передача EHLO..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Передача MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Отправка"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Передача RCPT TO..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Отправка данных..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Отправка сообщения (%d / %d байт)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr "%d / %d байт"
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Отправка сообщения"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "Произошла ошибка при отправке сообщения."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6723,11 +6719,11 @@ msgstr ""
 "Произошла ошибка при отправке сообщения:\n"
 "%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 msgid "Can't connect to SMTP server."
 msgstr "Ошибка соединения с сервером NNTP: %s:%d"
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Ошибка соединения с сервером NNTP: %s:%d"
@@ -6752,70 +6748,70 @@ msgstr "Результат проверки подписи"
 msgid "Checking signature"
 msgstr "Проверка подписи"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s от \"%s\""
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Подпись не найдена"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Хорошая подпись от \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Хорошая подпись"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Подпись от \"%s\" правильная, но нет доверия ключу"
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Подпись правильная, но нет доверия ключу"
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr "Подпись от \"%s\" правильная, но просрочена"
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 msgid "Signature valid but expired"
 msgstr "Подпись правильная, но просрочена"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr "Подпись от \"%s\" правильная, но ключ просрочен"
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr "Подпись правильная, но ключ просрочен"
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr "Подпись от \"%s\" правильная, но ключ был отозван"
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr "Подпись правильная, но ключ был отозван"
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ПЛОХАЯ подпись  от \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "ПЛОХАЯ подпись"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "Нет ключа для проверки подписи"
 
@@ -6918,7 +6914,7 @@ msgstr "Получение списка групп новостей..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Не удалось получить список групп новостей."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Выполнено."
 
@@ -7045,217 +7041,217 @@ msgstr "Несколько меток осталось. Обработать и�
 msgid "Scanning folder (%s)..."
 msgstr "Просмотр папки (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 msgid "_Search again"
 msgstr "Искать снова"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Нет непрочитанных сообщений"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "Непрочитанные сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Нет непрочитанных сообщений."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "Непрочитанные сообщения не найдены. Перейти к следующей папке?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Нет новых сообщений"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "Новые сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Нет новых сообщений."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "Новые сообщения не найдены. Перейти к следующей папке?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Нет отмеченных сообщений"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "Отмеченные сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Нет отмеченных сообщений"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "Отмеченные сообщения не найдены. Продолжить поиск с начала?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Нет выделенных цветом сообщений"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "Выделенные цветом сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Нет выделенных цветом сообщений."
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Выделенные цветом сообщения не найдены. Продолжить поиск с начала?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Группировка сообщений по темам..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d удалено"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d перемещено"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d скопировано"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " сообщений выбрано"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d новых, %d непрочитанных, %d всего (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d новых, %d непрочитанных, %d всего"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Сортировка..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tФормирование списка сообщений..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Формирование списка сообщений..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Запись кеша списка (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Сообщение %d помечено\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Сообщение %d помечено как прочитанное\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Сообщение %d помечено как непрочитанное\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Сообщение %s/%d помечено как удалённое\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Удаление сообщений"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Удалить сообщения без возможности восстановления?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Удаление повторяющихся сообщений..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "С сообщения %s/%d сняты пометки\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Сообщение %d помечено для перемещения в %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "Место назначения совпадает с текущей папкой."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 msgid "Select folder to move"
 msgstr "Выбор папки назначения"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Сообщение %d помечено для копирования в %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 msgid "Destination for copy is same as current folder."
 msgstr "Место назначения для копирования совпадает с текущей папкой."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 msgid "Select folder to copy"
 msgstr "Выбор папки назначения"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 msgid "Error occurred while processing messages."
 msgstr "Произошла ошибка при обработке сообщений."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Связывание обсуждений..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Отмена связывания обсуждений..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фильтрация (%d / %d)..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "фильтрация..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Фильтрация..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d сообщений отфильтровано."
@@ -7345,11 +7341,11 @@ msgstr "Отправить сообщения из очереди"
 msgid "E_xit"
 msgstr "Выход"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
@@ -7357,22 +7353,28 @@ msgstr ""
 "Найдена новая версия Sylpheed.\n"
 " Обновить сейчас?"
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 msgid "New version found"
 msgstr "Найдена новая версия"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 msgid "Information"
 msgstr "Информация"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 msgid "Sylpheed is already the latest version."
 msgstr "Используется последняя версия Sylpheed."
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr "Невозможно получить информацию о версии."
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "Не удалось открыть файл пометок.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "g_thread не поддерживается в glib.\n"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Укажите экспортируемую папку и файл mbox."
 
diff --git a/po/sk.po b/po/sk.po
index 581f8fec..92159f3d 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: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+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,228 +20,228 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Načítavam nastavenia pre všetky kontá...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 spojenie k %s sa prerušilo. Znovu pripájam...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Priečinok serveru IMAP"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "vytváram IMAP4 spojenie k %s:%d ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "Nedá sa vytvoriť TLS spojenie.\n"
 
-#: libsylph/imap.c:1176
+#: libsylph/imap.c:1230
 #, fuzzy, c-format
-msgid "Getting message %d"
+msgid "Getting message %u"
 msgstr "Odstraňujem správu %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Kopírujem správu %s%c%d do %s ...\n"
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopírujem správu %s%c%d do %s ...\n"
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Prijímam správy z %s..."
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nedá sa nastaviť príznak zmazania: %s\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "nedá sa odstrániť\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Prijímam správy z %s..."
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nedá sa nastaviť príznak zmazania: 1:*\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "priečinok sa nedá zatvoriť\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "koreňový priečinok %s neexistuje\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "pri príkaze LIST sa vyskytla chyba.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Nedá sa vytvoriť '%s'\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Nedá sa vytvoriť '%s' v INBOXe\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nedá sa vytvoriť schránka: príkaz LIST zlyhal\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "nedá sa vytvoriť schránka\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nedá sa premenovať schránka: %s na %s\n"
 
-#: libsylph/imap.c:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "schránka sa nedá odstrániť \n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "obálka sa nedá načítať\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "obálka sa nedá načítať\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "pri získavaní obálky sa vyskytla chyba.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "obálka sa nedá prečítať: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, 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:2714
+#: libsylph/imap.c:2863
 #, 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:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "nedá sa nájsť obálka\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "priečinok sa nedá vytvoriť: %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "chyba pri IMAP príkaze: CLOSE\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 autentizácia bola neúspešná.\n"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "neúspešné prihlásenie k IMAP4.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nedá sa napojiť %s k %s\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(posielam súbor...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nedá sa napojiť správa k %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nedá sa kopírovať %s do %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "chyba pri IMAP príkaze: STORE %s %s\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "chyba pri IMAP príkaze: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "chyba pri IMAP príkaze: CLOSE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nemôže skonvertovať UTF-7 na %s\n"
 
-#: libsylph/imap.c:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nemôže skonvertovať %s na UTF-7\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "nemôžem zapisovať do dočasného súboru\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Prijímam správy z %s do %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "nemôžem prečítať súbor mbox.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "neplatný formát mbox: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "poškodený mbox: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "nemôžem otvoriť dočasný súbor\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -250,66 +250,62 @@ msgstr ""
 "neukončené From:\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "nemôžem vytvoriť zámkový súbor %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "ak je to možné, miesto 'file' použite 'flock'.\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "nemôžem vytvoriť %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "iný proces vlastní mailbox, čakám...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "nemôžem uzamknúť %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "neplatný typ zámku\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "nemôžem odomknúť %s\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "nemôžem skrátiť mailbox na nulovú dĺžku.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportujem správy z %s do %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, 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:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "Nemôžem označiť súbor so značkami.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "zdrojový priečinok je ten istý ako cieľový.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopírujem správu %s%c%d do %s ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -318,7 +314,7 @@ msgstr ""
 "Súbor '%s' už existuje.\n"
 "Priečinok sa nedá vytvoriť."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -330,77 +326,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "nadväzujem NNTP spojenie k %s:%d ...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 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:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "článok %d už je v medzipamäti.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "prijímam článok %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "nemôžem prečítať článok %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "nemôžem odoslať článok.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "nemôžem prijať článok %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "nemôžem vybrať skupinu %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neplatný rozsah článkov: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "žiadne nové články.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "prijímam xover %d - %d v %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "nemôžem prijať xover\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "pri prijímaní xover sa vyskytla chyba.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "neplatný xover riadok: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "nemôžem prijať xhdr\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "pri prijímaní xhdr sa vyskytla chyba.\n"
 
@@ -459,27 +455,27 @@ msgstr "POP3: Odstraňujem starú správu %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Preskakujem správu %d (%d bajtov)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "mailbox je zamknutý\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "čas spojenia vypršal\n"
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "nemôžem vytvoriť TLS reláciu\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "vyskytla sa chyba v autentizácii\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "príkaz nie je podporovaný\n"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "vyskytla sa chyba pri POP3 spojení\n"
 
@@ -512,16 +508,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:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "nemôžem otvoriť súbor so značkami\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nedá sa prijať správa %d\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Príkazový riadok tlače je neplatný: '%s'\n"
@@ -675,7 +671,7 @@ msgstr ""
 "Nové správy budú kontrolované v tomto poradí. Ak má byť konto kontrolované\n"
 "pri voľbe 'Prijať všetko', zatrhnite políčko v stĺpci označenom 'G'."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -818,7 +814,7 @@ msgstr "Pridať adresu do adresára"
 msgid "Address"
 msgstr "Adresár"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Poznámky"
@@ -827,29 +823,29 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vyberte priečinok adresára"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Súbor"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_Súbor/Nový _Adresár"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_Súbor/Nový _vCard"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/_Súbor/Nový _JPilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Súbor/Nový _Server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -857,101 +853,101 @@ msgstr "/_Súbor/Nový _Server"
 msgid "/_File/---"
 msgstr "/_Súbor/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_Súbor/_Upraviť"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_Súbor/Z_mazať"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Súbor/_Zavrieť"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Upraviť"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/_Prilepiť"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nová _Adresa"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nová _Skupina"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Nový _Priečinok"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/_Adresa/--- "
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Upraviť"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Nápo_veda"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Nápo_veda/_O programe"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Nová _Adresa"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Nová _Skupina"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Nový _Priečinok"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -964,82 +960,88 @@ msgstr "/Nový _Priečinok"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/Z_mazať"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopírovať..."
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 #, fuzzy
 msgid "/_Paste"
 msgstr "/Úp_ravy/_Prilepiť"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "E-mailová adresa"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Otvoriť adresár"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Priečinok"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "E-mailová adresa"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Meno:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Komu:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kópia:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Slepá kópia:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Zmazať"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Pridať"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Vyhľadať"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 #, fuzzy
 msgid "_Close"
 msgstr "Zavrieť"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Zmazať adresu(y)"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Naozaj zmazať adresu(y)?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1048,38 +1050,38 @@ msgstr ""
 "Naozaj chcete zmazať priečinok A SÚČASNE všetky adresy v %s ?\n"
 "Ak zmažete len priečinok, adresy z neho sa presunú do nadradeného priečinku."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 #, fuzzy
 msgid "_Folder only"
 msgstr "Len priečinok"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Priečinok aj adresy"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Naozaj zmazať '%s' ?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Nový uživateľ; nepodarilo sa uložiť indexový súbor."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Nový uživateľ; nedajú sa uložiť súbory adresára."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Konverzia starého adresára prebehla úspešne."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1087,7 +1089,7 @@ msgstr ""
 "Konverzia starého adresára prebehla,\n"
 "nedá sa uložiť indexový súbor nového adresára"
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1095,7 +1097,7 @@ msgstr ""
 "Nedá sa konvertovať starý adresár,\n"
 "ale boli vytvorené prázdne súbory nového adresára."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1103,7 +1105,7 @@ msgstr ""
 "Nedá sa konvertovať starý adresár,\n"
 "nedajú sa ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1111,97 +1113,91 @@ msgstr ""
 "Nedá sa konvertovať starý adresár\n"
 "a nedajú sa ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Chyba v adresári"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Nedá sa načítať zoznam adries"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Konverzia starého adresára prebehla, nedá sa uložiť indexový súbor nového "
 "adresára"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Nedá sa konvertovať starý adresár, ale boli vytvorené prázdne súbory nového "
 "adresára."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Nedá sa konvertovať starý adresár, nedajú sa ani vytvoriť súbory nového "
 "adresára."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Nedá sa konvertovať starý adresár a nedajú sa ani vytvoriť súbory nového "
 "adresára."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Ovládanie"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresár"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Skupina"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Priečinok"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -1213,15 +1209,15 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Upozornenie"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Varovanie"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Chyba"
 
@@ -1264,7 +1260,7 @@ msgstr "Hnedá"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Žiadna"
 
@@ -1636,8 +1632,8 @@ msgstr "Správa: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Nedá sa získať časť viacdielnej správy."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 
@@ -1829,7 +1825,7 @@ msgstr "MIME typ"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Veľkosť"
 
@@ -2078,12 +2074,12 @@ msgstr "Upraviť priečinok"
 msgid "Input the new name of folder:"
 msgstr "Zadajte nový názov priečinka:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Nový priečinok"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Zadajte názov nového priečinka:"
 
@@ -2230,7 +2226,7 @@ msgstr "Exportovať"
 msgid "Specify source folder and destination file."
 msgstr "Zvoľte importovaný mbox súbor a cieľový priečinok."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Formát dátumu"
@@ -2245,7 +2241,7 @@ msgstr "Zdrojový priečinok:"
 msgid "Destination:"
 msgstr "Cieľ"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2257,7 +2253,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "Zvoľte..."
@@ -2319,23 +2315,23 @@ msgstr "Odpadkový kôš"
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "Nový Priečinok"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Názov priečinka nemôže obsahovať `%c'."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Priečinok `%s' už existuje."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nedá sa vytvoriť priečinok `%s'."
@@ -2466,32 +2462,32 @@ msgstr "Kontrolujem nové spráby vo všetkých priečinkoch..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Priečinok %s je zvolený\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Odosielam správu..."
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Odosielam správu..."
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 #, fuzzy
 msgid "Download all messages"
 msgstr "Odosielam správu..."
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2501,26 +2497,26 @@ msgstr ""
 "(Ak chcete vytvoriť priečinok s ďalšími podzložkami,\n"
 "pridajte na koniec názvu '/')"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadajte nový názov pre `%s':"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Premenovať priečinok"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2529,12 +2525,12 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Odstrániť priečinok"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2545,21 +2541,21 @@ msgstr ""
 "Všetky priečinky a správy v `%s' budú odstránené.\n"
 "Naozaj pokračovať?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2568,34 +2564,34 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "Odstrániť schránku"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Naozaj chcete odstrániť IMAP4 konto '%s'?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "Odstrániť IMAP4 konto"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Naozaj chcete odstrániť diskusnú skupinu '%s'?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Odstrániť diskusnú skupinu"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Naozaj chcede odstrániť news konto '%s'?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Odstrániť news konto"
 
@@ -2607,8 +2603,8 @@ msgstr "Diskusné skupiny:"
 msgid "Creating header view...\n"
 msgstr "Vytváram náhľad hlavičky...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(nie je známy odosielateľ)"
 
@@ -2620,71 +2616,71 @@ msgstr "Vytváram náhľad obrázku...\n"
 msgid "Can't load the image."
 msgstr "Nedá sa načítať obrázok."
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Súbor %s neexistuje\n"
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Zvoľte importovaný mbox súbor a cieľový priečinok."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Prehľadávam priečinok %s ..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Importovať"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Prehľadávam priečinok %s ..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Pri odosielaní sa vyskytla chyba\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Importovať"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Zvoľte importovaný mbox súbor a cieľový priečinok."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Zdrojový priečinok:"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Cieľový priečinok:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nový priečinok"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Zvoľte importovaný mbox súbor a cieľový priečinok."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Zvoľte súbor pre import"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Zvoľte súbor pre import"
 
@@ -2845,158 +2841,158 @@ msgstr "Importovať súbor LDIF do adresára"
 msgid "Attributes"
 msgstr "Atribúty"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Dokončené (%d nových správ)"
 
-#: src/inc.c:477
+#: src/inc.c:478
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autentizácia"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Prijímam nové správy"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "Čakajte"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Zrušené"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Prijímam"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Hotovo (%d správ (%s) prijatých)"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Žiadne nové správy."
 
-#: src/inc.c:708
+#: src/inc.c:715
 #, fuzzy
 msgid "Done"
 msgstr "Hotovo."
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Autentizácia zlyhala"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Zamknuté"
 
-#: src/inc.c:730
+#: src/inc.c:737
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (v sekundách)"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Dokončené (%d nových správ)"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Dokončené (žiadne nové správy)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "Pri prijímaní pošty sa vyskytli chyby."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "prijímam nové správy pre konto %s...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autentizácia"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prijímam nové správy"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Pripájam sa k serveru POP3: %s..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentizácia..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Prijímam správy z %s..."
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Získavam počet nových správ (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Získavam počet nových správ (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Získavam počet nových správ (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Získavam veľkosť správ (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "Odstraňujem správu %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Odpájam sa"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prijímam správu (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 msgid "Connection failed."
 msgstr "Spojenie zlyhalo."
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3005,29 +3001,29 @@ msgstr ""
 "Pri spracovávaní pošty sa vyskytla chyba:\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Na disku už nie je miesto."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "Nedá sa zapisovať do súboru."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "Chyba socketu."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Vzdialený hostiteľ ukončil spojenie."
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "Mailbox je zamknutý."
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3036,11 +3032,11 @@ msgstr ""
 "Mailbox je zamknutý:\n"
 "%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Autentizácia bola neúspešná."
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3049,16 +3045,16 @@ msgstr ""
 "Autentizácia bola neúspešná:\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 #, fuzzy
 msgid "Session timed out."
 msgstr "čas spojenia vypršal\n"
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "Začleňovanie zrušené\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Prijímam nové správy z %s do %s...\n"
@@ -3072,24 +3068,20 @@ msgstr "Zadajte heslo pre %s na %s:"
 msgid "Input password"
 msgstr "Zadajte heslo"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Záznam protokolu"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "glib nepodporuje g_thread.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použitie: %s [VOĽBY]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]    otvorí okno pre písanie novej správy"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3100,23 +3092,23 @@ msgstr ""
 "uvedenými\n"
 "                         súbormi"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prijme nové správy"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          prijme nové správy pre všetky kontá"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 pošle všetky správy vo výstupnej fronte"
 
-#: src/main.c:542
+#: src/main.c:554
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [priečinok]...   zobrazí celkový počet správ"
 
-#: src/main.c:543
+#: src/main.c:555
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3124,50 +3116,50 @@ msgstr ""
 "  --status-full [priečinok]...\n"
 "                        zobrazí stav jednotlivých priečinkov"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:550
+#: src/main.c:562
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                ladiaci mód"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                ladiaci mód"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                zobrazí túto nápovedu a ukončí program"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr ""
 "  --version                zobrazí informácie o verzii a ukončí program"
 
-#: src/main.c:557
+#: src/main.c:569
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "alebo stlačte klávesu 'y'.\n"
 "\n"
 
-#: src/main.c:638
+#: src/main.c:694
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Výstupné kódovanie znakov"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3181,19 +3173,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "Máte rozpísanú správu. Naozaj ukončiť?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Správy vo fronte"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vo fronte sú neodoslané správy. Ukončiť program?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3201,17 +3193,21 @@ msgstr ""
 "GnuPG nie je nainštalované správne, alebo jeho verzia je príliš stará.\n"
 "Podpora OpenPGP je vypnutá."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "už beží iná kópia Sylpheedu.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Nastavenie akcií"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3893,8 +3889,8 @@ msgstr "Vytváram hlavné okno...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavné Okno: alokácia farieb %d bola neúspešná\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "hotovo.\n"
 
@@ -4138,7 +4134,7 @@ msgstr "Prílohy"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemôžem uložiť súbor '%s'."
@@ -6289,19 +6285,19 @@ msgstr "Príloha"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Predmet"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Dátum"
 
@@ -6311,7 +6307,7 @@ msgid "Number"
 msgstr "Číslo"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 #, fuzzy
 msgid "To"
 msgstr "Komu:"
@@ -6615,30 +6611,30 @@ msgstr "nájdených %d správ.\n"
 msgid "%d messages found."
 msgstr "nájdených %d správ.\n"
 
-#: src/query_search.c:579
-#, fuzzy, c-format
-msgid "Searching %s ..."
-msgstr "Prehľadávam priečinok %s ..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrujem..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, fuzzy, c-format
+msgid "Searching %s ..."
+msgstr "Prehľadávam priečinok %s ..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(bez dátumu)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Uložiť medzi koncepty"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 #, fuzzy
 msgid "Folder name:"
 msgstr "Názov súboru"
@@ -6689,7 +6685,7 @@ msgstr ""
 msgid "Signature made at %s\n"
 msgstr "Podpísané dňa %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Chyba pri overovaní podpisu"
 
@@ -6718,7 +6714,7 @@ msgstr "O programe"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Odstrániť schránku"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "Č."
 
@@ -6744,58 +6740,58 @@ msgid ""
 "%s"
 msgstr "vyskytla sa chyba pri POP3 spojení\n"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Získavam počet nových správ (STAT)..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 #, fuzzy
 msgid "No message"
 msgstr "Žiadne nové správy."
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Zmazať správy"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Odpájam sa..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Prijímam nové správy"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Odoslať správu"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Prijímam nové správy"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Prijímam správy z %s..."
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 #, fuzzy
 msgid "Delete messages"
 msgstr "Zmazať správy"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6872,67 +6868,67 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Pripájam sa k serveru SMTP: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 #, fuzzy
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Pri odosielaní správy nastala chyba."
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "Posielam HELO..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "Autentizácia"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 msgid "Sending message..."
 msgstr "Odosielam správu..."
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "Posielam EHLO..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Posielam MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Posielam"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Posielam RCPT TO..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Posielam DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr ""
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Odosielam správu"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "Pri odosielaní správy nastala chyba."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6941,12 +6937,12 @@ msgstr ""
 "Pri odosielaní správy nastala chyba:\n"
 "%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 #, fuzzy
 msgid "Can't connect to SMTP server."
 msgstr "Nedá sa pripojiŤ k serveru NNTP: %s:%d\n"
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, fuzzy, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Nedá sa pripojiŤ k serveru NNTP: %s:%d\n"
@@ -6974,71 +6970,71 @@ msgstr "Zobraziť výsledok overenia ako upozornenie"
 msgid "Checking signature"
 msgstr "Overujem podpis"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s od \"%s\""
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Nebol nájdený žiadny podpis"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Správny podpis od \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Správny podpis"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr ""
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 #, fuzzy
 msgid "Signature valid but expired"
 msgstr "Podpísané dňa %s\n"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr ""
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr ""
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr ""
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr ""
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "CHYBNÝ podpis od \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "CHYBNÝ podpis"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "Nemôžem nájsť verejný kľúč pre overenie podpisu"
 
@@ -7136,7 +7132,7 @@ msgstr "Nedá sa získať zoznam diskusných skupín."
 msgid "Can't retrieve newsgroup list."
 msgstr "Nedá sa získať zoznam diskusných skupín."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Hotovo."
 
@@ -7267,222 +7263,222 @@ msgstr "Ostali nejaké značky. Spracovať?"
 msgid "Scanning folder (%s)..."
 msgstr "Prehľadávam priečinok (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 #, fuzzy
 msgid "_Search again"
 msgstr "Hľadať znova"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Žiadne neprečítané správy"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "Neboli nájdené žiadne neprečítané správy. Hľadať od konca?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Žiadne neprečítané správy."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Neboli nájdené žiadne neprečítané správy. Prejsť do ďalšieho priečinku?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Žiadne nové správy"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "Neboli nájdené žiadne nové správy. Hľadať od konca?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Žiadne nové správy."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "Neboli nájdené žiadne nové správy. Prejsť do ďalšieho priečinku?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Žiadne označené správy"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "Neboli nájdené žiadné označené správy. Hľadať od konca?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Žiadne označené správy."
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "Neboli nájdené žiadné označené správy. Hľadať od začiatku?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Žiadne zafarbené správy"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "Neboli nájdené žiadne zafarbené správy. Hľadať od konca?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Žiadne zafarbené správy."
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Neboli nájdené žiadne zafarbené správy. Hľadať od začiatku?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Zoskupujem správu podľa názvu..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d zmazaných"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d presunutých"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopírovaných"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " položiek zvolených"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novýcvh, %d neprečítaných, %d celkovo (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novýcvh, %d neprečítaných, %d celkovo"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Triedim zoznam správ..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tVytváram zoznam správ..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Vytváram zoznam správ..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisujem stav zoznamu do medzipamäte (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Správa %d je označená\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Správa %d je označená ako čítaná\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Správa %d je označená ako neprečítaná\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Správa %s/%d je určená na zmazanie\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Zmazať správy"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Naozaj chcete zmazať správy z koša?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Mažem duplikátne správy..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Správa %s/%d je odznačená\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Správa %d je určená k presunutiu do %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "Cieľ je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Zvoľte priečinok"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Správa %d je určená ku kopírovaniu do %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cieľ kopírovania je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Zvoľte priečinok"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 msgid "Error occurred while processing messages."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Vytváram vlákna..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Odstraňujem štruktúru vlákien..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "filtrujem..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
@@ -7577,36 +7573,42 @@ msgstr "Odoslať správy vo fronte"
 msgid "E_xit"
 msgstr "Ukončiť"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Starší Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "Nebol nájdený žiadny podpis"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "Informácie o serveri"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "už beží iná kópia Sylpheedu.\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "Nemôžem označiť súbor so značkami.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "glib nepodporuje g_thread.\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "Importovaný súbor:"
 
diff --git a/po/sl.po b/po/sl.po
index 662124ac..3cc28421 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: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+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,233 +18,233 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Berem vse nastavitve za vsak račun...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Povezava IMAP4 do %s%d se je prekinila. Povezujem se znova...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Imenik strežnika IMAP"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "delam povezavo IMAP4 do %s:%d ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "Ne morem pričeti seje TLS.\n"
 
-#: libsylph/imap.c:1176
+#: libsylph/imap.c:1230
 #, fuzzy, c-format
-msgid "Getting message %d"
+msgid "Getting message %u"
 msgstr "Brišem sporočilo %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Pošiljam sporočilo (%d / %d zlogov)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Prestavljam sporočilo %s%c%d v %s ...\n"
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiram sporočilo %s%c%d v %s ...\n"
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ne morem nastaviti izbrisanih zastavic: %d\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "ne morem izbrisati\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ne morem nastaviti izbrisanih zastavic: 1:%d\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ne morem izbrati mape: %s\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Datoteka z oznakami ni bila najdena.\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "med dobivanjem LIST je prišlo do napake.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Ne morem narediti '%s'\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Ne morem narediti '%s' pod mapo Prejeto\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ne morem narediti poštnega predala: LIST ni uspel\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "ne morem narediti poštnega predala\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, 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:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "ne morem izbrisati poštnega predala\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "ne morem dobiti ovojnice\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Pošiljam sporočilo (%d / %d zlogov)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "ne morem dobiti ovojnice\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "med dobivanjem ovojnice je prišlo do napake.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ne morem razčleniti ovojnice: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, 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:2714
+#: libsylph/imap.c:2863
 #, 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:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "ne morem dobiti imenskega prostora\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne morem izbrati mape: %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Overovitvena metoda"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "Prijava na IMAP4 ni uspela.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne morem pripeti %s na %s\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(pošiljam datoteko...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne morem dodati sporočila %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne morem kopirati %d na %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, 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:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne more pretvoriti UTF-7 v %s\n"
 
-#: libsylph/imap.c:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne more pretvoriti %s v UTF-7\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "ne morem pisati v začasno datoteko\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "ne morem prebrati datoteke mbox.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "napačen format mbox: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "napačno oblikovan mbox: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "ne morem odpreti začasne datoteke\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -253,66 +253,62 @@ msgstr ""
 "najdeno neubežno polje Od:\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "ne morem narediti datoteke za zaklepanje %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "če je mogoče, uporabi 'flock' namesto 'file'.\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "ne morem narediti %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "poštni predal si lasti drug proces, čakam...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "ne morem zakleniti %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "neveljaven tip zaklepanja\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "ne morem odkleniti %s\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "ne morem prisekati poštnega predala na ničlo.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Izvažam sporočila iz %s v %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ne morem prepisati sporočila %s v %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "Ne morem odpreti označene datoteke.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "Izvorna mapa je identična ciljni.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopiram sporočilo %s%c%d v %s ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -321,7 +317,7 @@ msgstr ""
 "Datoteka `%s' že obstaja.\n"
 "Ne morem narediti imenika."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -333,77 +329,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "ustvarjam povezavo NNTP do %s:%d ...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 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:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "članek %d je že v predpomnilniku.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "sprejemam članek %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "ne morem prebrati članka %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "ne morem poslati članka.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "ne morem sprejeti članka %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "ne morem izbrati skupine %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neveljavno območje člankov: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "ni novih člankov.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "sprejemam xover %d - %d v %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "ne morem prejeti xoverja\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "med prejemanjem xoverja je prišlo do napake.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "neveljavna vrstica xover: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "ne morem prejeti xhdr-ja\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "med prejemanjem xhdr-ja je prišlo do napake.\n"
 
@@ -462,28 +458,28 @@ msgstr "POP3: brišem poteklo sporočilo %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Izpuščam sporočilo %d (%d zlogov)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "poštni predal je zaklenjen\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr ""
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "ne morem pričeti seje TLS\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "Med preverjanjem istovetnosti je prišlo do napake\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 #, fuzzy
 msgid "command not supported\n"
 msgstr "Ukaz"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "Med preverjanjem istovetnosti je prišlo do napake\n"
@@ -517,16 +513,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:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "Ne morem odpreti datoteke z oznakami.\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ne morem prenesti sporočila %d\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za tiskanje ni veljavna: `%s'\n"
@@ -683,7 +679,7 @@ msgstr ""
 "Nova sporočila bodo iskana v tem vrstnem redu. Označite izbirnike\n"
 "v stolpcu `G', da omogočite pobiranje sporočil z ukazom `Poberi vsa'."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -824,7 +820,7 @@ msgstr "Dodaj naslov v adresar"
 msgid "Address"
 msgstr "Naslov"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Opombe"
@@ -833,29 +829,29 @@ msgstr "Opombe"
 msgid "Select Address Book Folder"
 msgstr "Izberite mapo za adresar"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _Knjiga"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _v kartica"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Nov _JPilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Nov _strežnik"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -863,101 +859,101 @@ msgstr "/_Datoteka/Nov _strežnik"
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Urejanje"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Brisanje"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zapri"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Urejanje"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/_Prilepi"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/_Naslov"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/_Naslov/Nov n_aslov"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/_Naslov/Nova _skupina"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/_Naslov/Nova _mapa"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/_Naslov/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/_Naslov/_Urejanje"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Orodja"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoč/_O programu"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Nov n_aslov"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Nova _skupina"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -970,82 +966,88 @@ msgstr "/Nova _mapa"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Brisanje"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 #, fuzzy
 msgid "/_Copy"
 msgstr "/Prepiš_i..."
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Uredi/_Prilepi"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "Elektronski naslov"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Imenik naslovov"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Mapa"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "Elektronski naslov"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ime:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kp:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Skp:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Izbriši"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Dodajanje"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Poišči"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 #, fuzzy
 msgid "_Close"
 msgstr "Zapri"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Brisanje naslova"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Res želite izbrisati naslov(e)?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1054,38 +1056,38 @@ msgstr ""
 "Ali res želite izbrisati mapo IN vse naslove v '%s' ? \n"
 "Če izbrišete samo mapo, se bodo vsi naslovi prestavili v starševsko mapo."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Izbriši mapo"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo mapa"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mapa in naslovi"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Res želite izbrisati '%s' ?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Nov uporabnik, ne morem shraniti indeksne datoteke."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Nov uporabnik, ne morem shraniti datotek z iminiki naslovov."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Star imenik naslovov je bil uspešno pretvorjen."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1093,7 +1095,7 @@ msgstr ""
 "Stari imenik naslovov pretvorjen,\n"
 "ne morem shraniti nove indeksne datoteke naslovov"
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1101,7 +1103,7 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov,\n"
 "sem pa naredil prazne nove datoteke imenikov naslovov."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1109,7 +1111,7 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov,\n"
 "ne morem narediti novih datotek z imeniki naslovov."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1117,96 +1119,90 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov\n"
 "in ne morem narediti novih datotek z imeniki naslovov"
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Pretvarjam imenik naslovov"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Napaka v imeniku naslovov"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Ne morem prebrati indeksa naslovov"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Star imenik naslovov pretvorjen, ne morem shraniti nove indeksne datoteke "
 "naslovov"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Ne morem pretvoriti imenika naslovov, sem pa naredil prazno datoteko z "
 "imenikom naslovov."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Ne morem pretvoriti imenika naslovov, ne morem narediti novih datotek z "
 "imeniki naslovov."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Ne morem pretvoriti imenika naslovov in ne morem narediti novih datotek."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Pretvorba imenika naslovov"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Imenik naslovov"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Oseba"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Skupina"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Mapa"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "v-kartica"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "Strežnik LDAP"
 
@@ -1218,15 +1214,15 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Opomba"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Napaka"
 
@@ -1269,7 +1265,7 @@ msgstr "Rjava"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Nič"
 
@@ -1642,8 +1638,8 @@ msgstr "Sporočilo: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela večdelnega sporočila."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Brez zadeve)"
 
@@ -1834,7 +1830,7 @@ msgstr "Tip MIME"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Velikost"
 
@@ -2083,12 +2079,12 @@ msgstr "Urejanje mape"
 msgid "Input the new name of folder:"
 msgstr "Vnesite novo ime mape:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Nova mapa"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Vnesite ime nove mape:"
 
@@ -2234,7 +2230,7 @@ msgstr "Izvozi"
 msgid "Specify source folder and destination file."
 msgstr "Določite ciljno datoteko mbox in ciljno mapo."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Oblika datuma"
@@ -2249,7 +2245,7 @@ msgstr "Izvorni imenik:"
 msgid "Destination:"
 msgstr "Cilj"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2261,7 +2257,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Izberi... "
@@ -2323,23 +2319,23 @@ msgstr "Smeti"
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "Nova mapa"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Znaka '%c' ne more biti v imenu mape."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mapa '%s' že obstaja."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne morem narediti mape '%s'."
@@ -2471,32 +2467,32 @@ msgstr "Preverjam nova sporočila v vseh mapah..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mapa %s je izbrana\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pošiljam sporočilo"
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Pošiljam sporočilo"
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 #, fuzzy
 msgid "Download all messages"
 msgstr "Pošiljam sporočilo"
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Med pošiljanjem sporočila %s je prišlo do napake."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2506,26 +2502,26 @@ msgstr ""
 "(če želite narediti mapo za shranjevanje podmap,\n"
 "dodajte '/' na koncu imena datoteke)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Vnesite novo ime za '%s':"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Preimenuj mapo"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2534,12 +2530,12 @@ msgstr ""
 "Ali naj res odstranim poštni predal '%s' ?\n"
 "(Sporočila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Izbriši mapo"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2550,21 +2546,21 @@ msgstr ""
 "Vse mape in sporočila pod '%s' bodo izbrisana.\n"
 "Ali jih res želite izbrisati?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Izprazni smetnjak"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2573,34 +2569,34 @@ msgstr ""
 "Ali naj res odstranim poštni predal '%s' ?\n"
 "(Sporočila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "Odstrani poštni predal"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ali naj res izbrišem račun IMAP4 '%s'?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "Izbriši račun IMAP4"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ali naj res izbrišem novičarsko skupino '%s'?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Izbriši novičarsko skupino"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ali naj res izbrišem novičarski račun '%s'?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Izbriši novičarski račun"
 
@@ -2612,8 +2608,8 @@ msgstr "Novičarske skupine:"
 msgid "Creating header view...\n"
 msgstr "Delam gledanje zaglavja...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Brez pošiljatelja)"
 
@@ -2625,71 +2621,71 @@ msgstr "Delam gledanje slike...\n"
 msgid "Can't load the image."
 msgstr "Ne morem naložiti slike."
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Določite ciljno datoteko mbox in ciljno mapo."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Preiskujem mapo %s ..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Uvozi"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Preiskujem mapo %s ..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Med pošiljanjem je prišlo do napake\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Uvozi"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Določite ciljno datoteko mbox in ciljno mapo."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Izvorni imenik:"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Ciljni imenik:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nova mapa"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Določite ciljno datoteko mbox in ciljno mapo."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Izberite datoteko za uvoz"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Izberite datoteko za uvoz"
 
@@ -2850,215 +2846,215 @@ msgstr "Uvozi datoteko LDIF v imenik naslovov"
 msgid "Attributes"
 msgstr "Atributi"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Končano (%d novih sporočil)"
 
-#: src/inc.c:477
+#: src/inc.c:478
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Overovljam"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Prenašam nova sporočila"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "V pripravljenosti"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Preklicano"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Prenašam"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Opravljeno (%d sporočil (%s) prejetih)"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Ni novih sporočil."
 
-#: src/inc.c:708
+#: src/inc.c:715
 #, fuzzy
 msgid "Done"
 msgstr "Opravljeno."
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Overovitev ni uspela"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Zaklenjeno"
 
-#: src/inc.c:730
+#: src/inc.c:737
 #, fuzzy
 msgid "Timeout"
 msgstr "Čas izteka (sek.)"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Končano (%d novih sporočil)"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Končano (ni novih sporočil)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "Med prejemanjem pošte je prišlo do nekaterih napak."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "sprejemam nova sporočila z računa %s...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Overovljam"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prenašam nova sporočila"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se s strežnikom POP: %s"
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne morem se povezati s strežnikom POP: %s%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Overovljam..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Ugotavljam število novih sporočil (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Ugotavljam število novih sporočil (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Ugotavljam število novih sporočil (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Ugotavljam velikost sporočil (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "Brišem sporočilo %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Zapuščam"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prenašam sporočilo (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 #, fuzzy
 msgid "Connection failed."
 msgstr "Povezava ni uspela"
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Na disku ni prostora."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "Ne morem napisati datoteke."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "napaka v priključku."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "Poštni predal je zaklenjen."
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Poštni predal je zaklenjen."
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "Pripojitev odpovedana\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Pobiram nova sporočila iz %s v %s...\n"
@@ -3072,24 +3068,20 @@ msgstr "Vnesite geslo za %s na %s:"
 msgid "Input password"
 msgstr "Vnesite geslo"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Dnevnik protokola"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread ni podprt v glib.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uporaba: %s [MOŽNOST]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [naslov]     odpri okno za sestavljanje novega sporočila"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3099,73 +3091,73 @@ msgstr ""
 "                         odpri okno za sestavljanje s pripetimi\n"
 "                         podanimi datotekami"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              poberi nova sporočila"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          poberi nova sporočila z vseh računov"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 pošlji vsa čakajoča sporočila"
 
-#: src/main.c:542
+#: src/main.c:554
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               prikaži skupno število sporočil"
 
-#: src/main.c:543
+#: src/main.c:555
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               prikaži skupno število sporočil"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:550
+#: src/main.c:562
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                razhroščevalni način"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                razhroščevalni način"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 prikaži to pomoč in končaj"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              prikaži informacijo o različici in končaj"
 
-#: src/main.c:557
+#: src/main.c:569
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "ali pritisnite tipko `y'.\n"
 "\n"
 
-#: src/main.c:638
+#: src/main.c:694
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Izhodni nabor znakov"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3179,19 +3171,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "Še vedno sestavljate sporočilo. Ali naj res končam?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Čakajoča sporočila"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Nekaj neposlamih sporočil je na čakanju. Ali naj končam?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3199,17 +3191,21 @@ msgstr ""
 "GnuPG ni pravilno nameščen ali pa je različica prestara.\n"
 "Podpora za OpenPGP je izključena."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "Sylpheed že teče.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pišem nastavitve dejanj..\n"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3897,8 +3893,8 @@ msgstr "Ustvarjam glavno okno...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "GlavnoOkno: alokacija barve %d ni uspela\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "opravljeno.\n"
 
@@ -4141,7 +4137,7 @@ msgstr "Priloge"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne morem odstraniti datoteke `%s'."
@@ -6291,19 +6287,19 @@ msgstr "Priloga"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Zadeva"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Datum"
 
@@ -6313,7 +6309,7 @@ msgid "Number"
 msgstr "Število"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 #, fuzzy
 msgid "To"
 msgstr "Za:"
@@ -6615,30 +6611,30 @@ msgstr "najdenih %d sporočil.\n"
 msgid "%d messages found."
 msgstr "najdenih %d sporočil.\n"
 
-#: src/query_search.c:579
-#, fuzzy, c-format
-msgid "Searching %s ..."
-msgstr "Preiskujem mapo %s ..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriram..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, fuzzy, c-format
+msgid "Searching %s ..."
+msgstr "Preiskujem mapo %s ..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Brez datuma)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Shrani v imenik Draft"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 #, fuzzy
 msgid "Folder name:"
 msgstr "Ime datoteke"
@@ -6689,7 +6685,7 @@ msgstr ""
 msgid "Signature made at %s\n"
 msgstr "Podpis narejen v %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Napaka ob overovljanju podpisa"
 
@@ -6718,7 +6714,7 @@ msgstr "O"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Odstrani poštni predal"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "Ne."
 
@@ -6744,58 +6740,58 @@ msgid ""
 "%s"
 msgstr "Med preverjanjem istovetnosti je prišlo do napake\n"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Pošiljam sporočilo (%d / %d zlogov)"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Ugotavljam število novih sporočil (STAT)..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 #, fuzzy
 msgid "No message"
 msgstr "Ni novih sporočil."
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Izbriši sporočilo/a"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Zapuščam..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Prenašam nova sporočila"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Pošlji sporočilo"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Prenašam nova sporočila"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 #, fuzzy
 msgid "Delete messages"
 msgstr "Izbriši sporočilo/a"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6872,80 +6868,80 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Povezujem se s strežnikom SMTP: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 #, fuzzy
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "Pošiljam HELO..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "Overovljam"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 #, fuzzy
 msgid "Sending message..."
 msgstr "Pošiljam sporočilo"
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "Pošiljam EHLO..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Pošiljam MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Pošiljanje"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Pošiljam RCPT TO..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Pošiljam DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Pošiljam sporočilo (%d / %d zlogov)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr ""
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Pošiljam sporočilo"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "Med pošiljanjem sporočila je prišlo do napake."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
 "%s"
 msgstr "Med pošiljanjem sporočila je prišlo do napake."
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 #, fuzzy
 msgid "Can't connect to SMTP server."
 msgstr "Ne morem se povezati s strežnikom SMTP: %s:%d\n"
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, fuzzy, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Ne morem se povezati s strežnikom SMTP: %s:%d\n"
@@ -6973,71 +6969,71 @@ msgstr "Prikaži rezultat preverjanja podpisa v novem oknu"
 msgid "Checking signature"
 msgstr "Preverjam podpis"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s od \"%s\""
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Noben podpis ni bil najden"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dober podpis od \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Dober podpis"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr ""
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 #, fuzzy
 msgid "Signature valid but expired"
 msgstr "Podpis narejen v %s\n"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr ""
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr ""
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr ""
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr ""
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "SLAB podpis od \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "SLAB podpis"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "Ni javnega ključa za overovitev podpisa"
 
@@ -7136,7 +7132,7 @@ msgstr "Ne morem potegniti seznama novičarskih skupin."
 msgid "Can't retrieve newsgroup list."
 msgstr "Ne morem potegniti seznama novičarskih skupin."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Opravljeno."
 
@@ -7267,223 +7263,223 @@ msgstr "Nekaj oznak je ostalo. Naj obdelam?"
 msgid "Scanning folder (%s)..."
 msgstr "Preiskujem mapo (%s) ..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 #, fuzzy
 msgid "_Search again"
 msgstr "Ponovno iskanje"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Ni več neprebranih sporočil"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "Nobeno neprebrano sporočilo ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Ni neprebranih sporočil."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Nobeno neprebrano sporočilo ni bilo najdeno. Naj grem v naslednjo mapo?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Ni več neprebranih sporočil"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "Nobeno novo sporočilo ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Ni novih sporočil."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "Nobeno novo sporočilo ni bilo najdeno. Naj grem v naslednjo mapo?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Ni več označenih sporočil"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "Nobeno označeno sporočilo ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Ni označenih sporočil."
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nobeno označeno sporočilo ni bilo najdeno. Naj iščem od začetka?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Ni več sporočil z oznako"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "Nobeno sporočilo z oznako ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Ni sporočil z oznako"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nobeno sporočilo z oznako ni bilo najdeno. Naj iščem od začetka?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Privlačim sporočila po zadevi..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d izbrisanih"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d prestavljenih"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d presnetih"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " izbranih kosov"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d neprebranih, skupaj %d (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d neprebranih, skupaj %d"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Razvrščam povzetka..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tNastavljam povzetek iz podatkov sporočila..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Nastavljam povzetek iz podatkov sporočila..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišem povzetek predpomnilnika (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Sporočilo %d je označeno\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Sporočilo %d je označeno, kot da se bere\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Sporočilo %d je označeno kot neprebrano\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Sporočilo %s/%d je nastavljeno za brisanje\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Izbriši sporočilo/a"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Ali res želite izbrisati sporočila iz smetnjaka?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Brišem podvojena sporočila..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Sporočilo %s/%d je odoznačeno\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Sporočilo %d je nastavljeno za prestavitev v %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "Cilj je enak trenutni mapi."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Izberi mapo"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Sporočilo %d je nastavljeno za prepis v %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cilj prepisa je enak trenutni mapi"
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Izberi mapo"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Gradim niti..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Raznitujem..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sporočilo %d je že v predpomnilniku.\n"
@@ -7579,36 +7575,42 @@ msgstr "Pošlji čakajoča sporočila"
 msgid "E_xit"
 msgstr "Končaj"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Stari Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "Noben podpis ni bil najden"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "Podatki o strežniku"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "Sylpheed že teče.\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "Ne morem odpreti označene datoteke.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "g_thread ni podprt v glib.\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "Uvažam datoteko:"
 
diff --git a/po/sr.po b/po/sr.po
index a80edaa8..02cb4c36 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: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -19,233 +19,233 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Čitanje konfiguracije za svaki nalog...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 veza prema %s:%d je pukla. Povezujem se ponovo...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Direktorijum IMAP servera"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "ostvarujem IMAP4 vezu prema %s:%d ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "Ne mogu pokrenuti TLS sesiju.\n"
 
-#: libsylph/imap.c:1176
+#: libsylph/imap.c:1230
 #, fuzzy, c-format
-msgid "Getting message %d"
+msgid "Getting message %u"
 msgstr "Brišem poruke %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Šaljem poruku (%d / %d bajtova)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Pomeram poruke %s%c%d u %s ...\n"
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ne mogu postaviti obrisane oznake: %d\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "ne mogu obrisati\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ne mogu postaviti obrisane oznake: 1:%d\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ne mogu odabrati direktorijum: %s\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Označena datoteka ne postoji.\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "došlo je do greške prilikom dohvatanja LISTe.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "ne mogu kreirati '%s'\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "ne mogu kreirati '%s' ispod INBOX\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ne mogu kreirati sanduče: LIST nije uspeo\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "ne mogu kreirati sanduče\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, 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:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "ne mogu obrisati sanduče\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "ne mogu dobiti omot\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Šaljem poruku (%d / %d bajtova)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "ne mogu dobiti omot\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "došlo je do greške prilikom dobijanja omota.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ne mogu analizirati omot: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, 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:2714
+#: libsylph/imap.c:2863
 #, 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:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "ne mogu dobiti namespace\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne mogu odabrati direktorijum: %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Način provere identieta"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login nije uspeo.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne mogu dodati %s na %s\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(šaljem datoteku...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne mogu dodati poruku %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne mogu kopirati %d u %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, 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:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, 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:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne može prebaciti %s to UTF-7\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "ne mogu pisati u privremenu datoteku\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "ne mogu čitati mbox datoteku.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "pogrešan mbox format: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "pokvaren mbox: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "ne mogu otvoriti privremenu datoteku\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -254,66 +254,62 @@ msgstr ""
 "neizbežan Od pronađen:\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "ne mogu napraviti zaključanu datoteku %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "koristi 'flock' umesto 'file' ako je moguće.\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "ne mogu napraviti %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "neki drugi proces koristi sanduče, čekam...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "ne mogu zaključati %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "neispravan tip zaključavanja\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "ne mogu otključati %s\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "ne mogu skratiti sanduče na nulu.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Izvozim poruke iz %s u %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ne mogu kopirati poruku %s u %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "Ne mogu otvoriti označenu datoteku.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "izvorni direktorijum jednak je destinaciji.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -322,7 +318,7 @@ msgstr ""
 "Datoteka `%s' već postoji.\n"
 "Ne mogu napraviti direktorijum."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -334,77 +330,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "uspostavljam NNTP vezu sa %s:%d ...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 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:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "članak %d već je pohranjen.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "primam članak %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "ne mogu pročitati članak %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "ne mogu poslati članak.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "ne mogu primiti članak %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "ne mogu odabrati grupu %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "pogrešan opseg članaka: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "nema novih članaka.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "primam xover %d - %d u %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "ne mogu primiti xover\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "došlo je do greške prilikom primanja xovera.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "pogrešna xover linija: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "ne mogu dobiti xhdr\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "došlo je do greške prilikom primanja xhdra.\n"
 
@@ -463,28 +459,28 @@ msgstr "POP3: Brianje pouka koje su istekle %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Preskakanje poruke %d (%d byte-ova)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "sanduče je zaključano\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr ""
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "ne mogu pokrenuti TLS sesiju\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "greška prilikom provere identiteta\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 #, fuzzy
 msgid "command not supported\n"
 msgstr "Naredba"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "greška prilikom provere identiteta\n"
@@ -518,16 +514,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:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "ne mogu otvoriti obeleženu datoteku\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ne mogu dohvatiti poruku %d\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Naredba za štampanje nije dobra: `%s'\n"
@@ -683,7 +679,7 @@ msgstr ""
 "Nove poruke biti će proveravane ovim redom. Označite pod\n"
 "`G' one naloge sa kojih želite skinuti e-poštu sa `Primi sve'."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -824,7 +820,7 @@ msgstr "Dodaj adresu u adresar"
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Beleške"
@@ -833,29 +829,29 @@ msgstr "Beleške"
 msgid "Select Address Book Folder"
 msgstr "Odaberite direktorijum adresara"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _knjiga"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _vCard"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Novi _JPilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -863,101 +859,101 @@ msgstr "/_Datoteka/Novi _server"
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Izmeni"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Obriši"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Izmeni"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Izmeni/U_baci"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nova _adresa"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nova _grupa"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Novi _direktorijum"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/_Adresa/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Izmeni"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Alati"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Nova _adresa"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Nova _grupa"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Novi _direktorijum"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -970,82 +966,88 @@ msgstr "/Novi _direktorijum"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Obriši"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopiranje..."
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Izmeni/U_baci"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "Adresa e-pošte"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresar"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Direktorijum"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "Adresa e-pošte"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ime:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Potraži"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 #, fuzzy
 msgid "_Close"
 msgstr "Zatvori"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Obriši adresu/e"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Zaista obrisati adresu/e?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1055,38 +1057,38 @@ msgstr ""
 "Ako brišete samo direktorijum, adrese će biti premeštene u prethodni "
 "direktorijum."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Obriši direktorijum"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo direktorijum"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Direktorijum i adrese"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Zaista obrisati `%s' ?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu sačuvati index datoteku."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu sačuvati datoteke adresara."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspešno prebačen."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1094,7 +1096,7 @@ msgstr ""
 "Stari adresar ne može biti prebačen,\n"
 "ne mogu sačuvati novu index datoteku adresara."
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1102,7 +1104,7 @@ msgstr ""
 "Ne mogu prebaciti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1110,7 +1112,7 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1118,89 +1120,83 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "i ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Prebacivanje adresara"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr "Stari adresar unešen, ne mogu napraviti index datoteke novih adresa"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Ne mogu uneti adresar, pravim prazne datoteke novog adresara."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Ne mogu uneti adresar, ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Ne mogu uneti adresar i ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Izgled programa"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Grupa"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Direktorijum"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1212,15 +1208,15 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Obaveštenje"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Greška"
 
@@ -1263,7 +1259,7 @@ msgstr "Smeđa"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Ništa"
 
@@ -1636,8 +1632,8 @@ msgstr "Poruka: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti deo poruke iz više delova."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
@@ -1829,7 +1825,7 @@ msgstr "MIME tip"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Veličina"
 
@@ -2078,12 +2074,12 @@ msgstr "Izmeni direktorijum"
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Novi direktorijum"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
@@ -2229,7 +2225,7 @@ msgstr "Izvezi"
 msgid "Specify source folder and destination file."
 msgstr "Odredite željenu mbox datoteku i odredišni direktorijum."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Format datuma"
@@ -2244,7 +2240,7 @@ msgstr "Izvorni dir:"
 msgid "Destination:"
 msgstr "Odredište"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2256,7 +2252,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Odaberite... "
@@ -2318,23 +2314,23 @@ msgstr "Smeće"
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "NoviDir"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' ne može biti uvršten u ime direktorijuma."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Direktorijum `%s' već postoji."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu napraviti direktorijum `%s'."
@@ -2466,32 +2462,32 @@ msgstr "Proveravanje novih poruka u svim direktorijumima..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Direktorijum %s je odabran\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 #, fuzzy
 msgid "Download all messages"
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2501,26 +2497,26 @@ msgstr ""
 "(ukoliko želite napraviti direktorijum za smeštanje poddirektorijuma,\n"
 "dodajte `/' na kraj imena)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Preimenuj direktorijum"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2529,12 +2525,12 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Obriši direktorijum"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2545,21 +2541,21 @@ msgstr ""
 "Svi direktorijum(i) i poruka/e pod `%s' biće obrisane.\n"
 "Želite li ih zaista obrisati?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2568,34 +2564,34 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Zaista obrisati `%s' IMAP4 nalog?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 nalog"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Zaista obrisati `%s' news grupu?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Zaista obrisati `%s' news nalog?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Obriši news nalog"
 
@@ -2607,8 +2603,8 @@ msgstr "News grupe:"
 msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Bez pošiljaoca)"
 
@@ -2620,71 +2616,71 @@ msgstr "Kreiram pregled slika...\n"
 msgid "Can't load the image."
 msgstr "Ne mogu prikazati sliku."
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Odredite željenu mbox datoteku i odredišni direktorijum."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Pretražujem direktorijum %s ..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Uvezi"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Pretražujem direktorijum %s ..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Došlo je do greške prilikom slanja\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Uvezi"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Odredite željenu mbox datoteku i odredišni direktorijum."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Izvorni dir:"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Odredišni dir:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Novi direktorijum"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Odredite željenu mbox datoteku i odredišni direktorijum."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Odaberite datoteku za uvoz"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Odaberite datoteku za uvoz"
 
@@ -2845,214 +2841,214 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Attributes"
 msgstr "Atributi"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Završeno (%d novih poruka)"
 
-#: src/inc.c:477
+#: src/inc.c:478
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Provera identiteta"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Primam nove poruke"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "Standby"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Primam"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Gotovo (%d poruke/a (%s) primljeno)"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Nema novih poruka."
 
-#: src/inc.c:708
+#: src/inc.c:715
 msgid "Done"
 msgstr "Gotovo"
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Veza nije ostvarena"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Identifikacija nije uspela"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Zaključano"
 
-#: src/inc.c:730
+#: src/inc.c:737
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Završeno (%d novih poruka)"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "Došlo je do grešaka prilikom primanja pošte."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "primam nove poruke za nalog %s...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Provera identiteta"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Primam nove poruke"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se na POP3 server: %s ..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne mogu se povezati na POP3 server: %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Preuzimam broj novih poruka (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Preuzimam broj novih poruka (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Preuzimam broj novih poruka (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Preuzimam veličinu poruka (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "Brišem poruke %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Izlazim"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 #, fuzzy
 msgid "Connection failed."
 msgstr "Veza nije ostvarena"
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Nema više mesta na disku."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "Ne mogu pisati u datoteku."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "Protokol greška."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "Sanduče je zaključano."
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Sanduče je zaključano."
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Način provere identieta"
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Način provere identieta"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "Incorporation otkazano\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Primam nove poruke od %s u %s...\n"
@@ -3066,24 +3062,20 @@ msgstr "Unesite lozinku za %s na %s:"
 msgid "Input password"
 msgstr "Unesite lozinku"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Zapis protokola"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "glib ne podržava g_thread.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]     otvara prozor za pisanje"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3093,73 +3085,73 @@ msgstr ""
 "                         otvara prozor za pisanje sa navedenim datotekama\n"
 "                         dodato"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prima nove poruke"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          primi sve poruke sa svih naloga"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 šalje sve odložene poruke"
 
-#: src/main.c:542
+#: src/main.c:554
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               pokazuje ukupan broj poruka"
 
-#: src/main.c:543
+#: src/main.c:555
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               pokazuje ukupan broj poruka"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:550
+#: src/main.c:562
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                debug način"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug način"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 prikaž ovu pomoć izađi"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              prikazuje verziju i izlazi"
 
-#: src/main.c:557
+#: src/main.c:569
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "ili pritisnite `y´ tipku.\n"
 "\n"
 
-#: src/main.c:638
+#: src/main.c:694
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Izlazni charset"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3173,19 +3165,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "Napisana poruka postoji. Zaista prekinuti?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Odložene poruke"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Neke neposlate poruke su odložene. Izaći odmah?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3193,17 +3185,21 @@ msgstr ""
 "GnuPG nije pravilno instaliran ili je verzija suviše stara.\n"
 "OpenPGP podrška je onemogućena."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "drugi Sylpheed već radi.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pisanje konfiguracije za akcije...\n"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3892,8 +3888,8 @@ msgstr "Kreiranje glavnih prozora...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Glavni Prozor: prikaz boje %d nije uspeo\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "gotovo.\n"
 
@@ -4136,7 +4132,7 @@ msgstr "Dodatak"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu sačuvati datoteku `%s'."
@@ -6285,19 +6281,19 @@ msgstr "Dodatak"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Datum"
 
@@ -6307,7 +6303,7 @@ msgid "Number"
 msgstr "Broj"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 #, fuzzy
 msgid "To"
 msgstr "Za:"
@@ -6609,31 +6605,31 @@ msgstr "%d poruka pronađeno.\n"
 msgid "%d messages found."
 msgstr "%d poruka pronađeno.\n"
 
-#: src/query_search.c:579
-#, fuzzy, c-format
-msgid "Searching %s ..."
-msgstr "Pretražujem direktorijum %s ..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, fuzzy, c-format
+msgid "Searching %s ..."
+msgstr "Pretražujem direktorijum %s ..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Traži direktorijum"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 #, fuzzy
 msgid "Location:"
 msgstr "Citat"
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 #, fuzzy
 msgid "Folder name:"
 msgstr "Ime datoteke"
@@ -6684,7 +6680,7 @@ msgstr ""
 msgid "Signature made at %s\n"
 msgstr "Potpis napravljen %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Greška pri potvrđivanju potpisa"
 
@@ -6713,7 +6709,7 @@ msgstr "O"
 msgid "%s - POP3 Remote mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "Ne."
 
@@ -6739,58 +6735,58 @@ msgid ""
 "%s"
 msgstr "greška prilikom provere identiteta\n"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Šaljem poruku (%d / %d bajtova)"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Preuzimam broj novih poruka (STAT)..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 #, fuzzy
 msgid "No message"
 msgstr "Nema novih poruka."
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Obriši poruku/e"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Završavnje..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Primam nove poruke"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Pošalji poruku"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Primam nove poruke"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 #, fuzzy
 msgid "Delete messages"
 msgstr "Obriši poruku/e"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6867,81 +6863,81 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Spajam se na SMTP server: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 #, fuzzy
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, fuzzy, c-format
 msgid "Sending HELO..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 #, fuzzy
 msgid "Authenticating"
 msgstr "Provera identiteta"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 #, fuzzy
 msgid "Sending message..."
 msgstr "Šaljem poruku"
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, fuzzy, c-format
 msgid "Sending EHLO..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Šaljem"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Šaljem RCPT TO..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Šaljem DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Šaljem poruku (%d / %d bajtova)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr ""
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Šaljem poruku"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "Došlo je do greške prilikom slanja poruke."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
 "%s"
 msgstr "Došlo je do greške prilikom slanja poruke."
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 #, fuzzy
 msgid "Can't connect to SMTP server."
 msgstr "Ne mogu se povezati na SMTP server: %s:%d\n"
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, fuzzy, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Ne mogu se povezati na SMTP server: %s:%d\n"
@@ -6969,71 +6965,71 @@ msgstr "Prikaži potpis u popup prozoru"
 msgid "Checking signature"
 msgstr "Provera potpisa"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s od \"%s\""
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Nema potpisa"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobar potpis od \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Dobar potpis"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr ""
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 #, fuzzy
 msgid "Signature valid but expired"
 msgstr "Potpis napravljen %s\n"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr ""
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr ""
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr ""
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr ""
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "LOŠ potpis od \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "LOŠ potpis"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "Nema javnog ključa za potvrdu potpisa"
 
@@ -7132,7 +7128,7 @@ msgstr "Ne mogu pronaći listu news grupa."
 msgid "Can't retrieve newsgroup list."
 msgstr "Ne mogu pronaći listu news grupa."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Gotovo."
 
@@ -7263,222 +7259,222 @@ msgstr "Neke oznake su izostavljene. Izvršiti ih?"
 msgid "Scanning folder (%s)..."
 msgstr "Pregledanje direktorijuma (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 #, fuzzy
 msgid "_Search again"
 msgstr "Pretraži ponovo"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "Nema više nepročitanih poruka. Preći u sledeći direktorijum?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Nema više novih poruka"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "Nema više novih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Nema novih poruka."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "Nema više novih poruka. Preći u sledeći direktorijum?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Nema više označenih poruka"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "Nema više označenih poruka. Nastaviti od kraja?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Nema označenih poruka."
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nema označenih poruka. Tražiti od početka?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Nema više obeleženih poruka"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "Nema više obeleženih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Nema obeleženih poruka."
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nema više obeleženih poruka. Krenuti od početka?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Prihvatanje poruka po temi..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d obrisano"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d premešteno"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopirano"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " jedinica odabrano"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d nepročitanih, %d ukupno (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d nepročitanih, %d ukupno"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Slažem pregled..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tPostavljanje pregleda od podataka poruke..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Postavljanje pregleda od podataka poruke..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišenje pohranu pregleda (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Želite li zaista obrisati poruku/e iz smeća?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Brianje duplih poruka..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Poruka %d je označena za premeštanje u %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "Odredište je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Odaberite direktorijum"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Poruka %d je označena za kopiranje u %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "ODredište za kopiranje je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Odaberite direktorijum"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Izgrađivanje stabla..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Rasipanje..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "filtriranje..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
@@ -7574,36 +7570,42 @@ msgstr "Šalje odložene poruku/e"
 msgid "E_xit"
 msgstr "Izlaz"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Stari Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "Nema potpisa"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "Informacije o serveru"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "drugi Sylpheed već radi.\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "Ne mogu otvoriti označenu datoteku.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "glib ne podržava g_thread.\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "Uvozim datoteku:"
 
diff --git a/po/sv.po b/po/sv.po
index 85d6b1b0..e8344cb9 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: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+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,226 +19,226 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Läser all konfiguration för varje konto...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-förbindelse till %s har avbrutits. Återuppkopplar...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP-server stänger av LOGIN.\n"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "skapar IMAP4-förbindelse till %s:%d...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "Kan inte starta TLS-session.\n"
 
-#: libsylph/imap.c:1176
-#, c-format
-msgid "Getting message %d"
+#: libsylph/imap.c:1230
+#, fuzzy, c-format
+msgid "Getting message %u"
 msgstr "Hämtar meddelande %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Lägger till meddelande till %s (%d / %d)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Flyttar meddelande %s till %s..."
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopierar meddelanden %s till %s..."
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, c-format
 msgid "Removing messages %s"
 msgstr "Tar bort meddelanden %s"
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kan inte sätta borttaget-flaggor: %s\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "kan inte utplåna\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Tar bort alla meddelanden i %s"
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kan inte sätta borttaget-flaggor: 1:*\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "kan inte stänga mapp\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "rotmapp %s finns inte\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "fel uppstod vid hämtning av LIST.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Kan inte skapa \"%s\"\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "kan inte skapa \"%s\" under INBOX\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan inte skapa brevlåda: LIST misslyckades\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "kan inte skapa brevlåda\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, 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:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "kan inte ta bort brevlåda\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "kan inte hämta kuvert\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Hämtar meddelandehuvuden (%d / %d)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "kan inte hämta kuvert\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "fel uppstod vid hämtning av kuvert.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kan inte tolka kuvert: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, 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:2714
+#: libsylph/imap.c:2863
 #, 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:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "kan inte hämta namnutrymme\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan inte välja mapp: %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 msgid "error on imap command: STATUS\n"
 msgstr "fel vid imapkommando: STATUS\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4-autentisering misslyckades.\n"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-inloggning misslyckades.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan inte lägga till %s till %s\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(skickar fil...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kan inte lägga till meddelande till %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan inte kopiera %s till %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "fel vid imapkommando: STORE %s %s\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "fel vid imapkommando: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "fel vid imapkommando: CLOSE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan inte konvertera UTF-7 till %s\n"
 
-#: libsylph/imap.c:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan inte konvertera %s till UTF-7\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "kan inte skriva till temporär fil\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Hämtar meddelanden från %s till %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "kan inte läsa mboxfil.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "felaktigt mboxformat: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "felformad mbox: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "kan inte öppna temporär fil\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -247,66 +247,62 @@ msgstr ""
 "o-esc:at Från-fält funnet:\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "kan inte skapa låsfil %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "använd \"flock\" istället för \"file\" om möjligt.\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "kan inte skapa %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "brevlådan ägs av en annan process, väntar...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "kan inte låsa %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "felaktig låstyp\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "kan inte låsa upp %s\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "kan inte korta av brevlåda till noll.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exporterar meddelanden från %s till %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "kan inte kopiera meddelande %s till %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "Kan inte öppna markeringsfil.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "ursprungsmappen är identisk med dest.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopierar meddelande %s%c%d till %s...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -315,7 +311,7 @@ msgstr ""
 "Filen \"%s\" finns redan.\n"
 "Kan inte skapa mapp."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -334,77 +330,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "skapar NNTP-förbindelse till %s:%d ...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 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:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "inlägget %d har redan cachats.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "hämtar inlägg %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "kan inte läsa inlägg %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "kan inte posta inlägg.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "kan inte hämta inlägg %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "kan inte välja grupp %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "felaktigt inläggsomfång: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "inga nya inlägg.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "hämtar xover %d - %d i %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "kan inte hämta xover\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "fel uppstod vid hämtning av xover.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "felaktig xover-rad: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "kan inte hämta xhdr\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "fel uppstod vid hämtning av xhdr.\n"
 
@@ -462,27 +458,27 @@ msgstr "POP3: Tar bort utgånget meddelande %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Hoppar över meddelande %d (%d byte)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "brevlådan är låst\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "sessionens väntetid tog slut\n"
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "kan inte starta TLS-session\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "fel uppstod vid autentisering\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "kommando är inte stött\n"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "fel uppstod vid POP3-session\n"
 
@@ -514,16 +510,16 @@ msgstr "Skräppostfilter"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Kodkonvertering misslyckades.\n"
 
-#: libsylph/procmsg.c:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "kan inte öppna markeringsfil\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kan inte hämta meddelande %d\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Utskriftskommando är felaktigt: \"%s\"\n"
@@ -680,7 +676,7 @@ msgstr ""
 "Markera rutorna i `G'-kolumnen för att aktivera meddelandehämtning\n"
 "via \"Hämta alla\""
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -821,7 +817,7 @@ msgstr "Lägg till i adressbok"
 msgid "Address"
 msgstr "Adress"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Kommentarer"
@@ -830,29 +826,29 @@ msgstr "Kommentarer"
 msgid "Select Address Book Folder"
 msgstr "Välj adressboksmapp"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Arkiv"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_Arkiv/Ny _bok"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_Arkiv/Nytt _vCard"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/_Arkiv/Ny _JPilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Arkiv/Ny _Server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -860,101 +856,101 @@ msgstr "/_Arkiv/Ny _Server"
 msgid "/_File/---"
 msgstr "/_Arkiv/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_Arkiv/_Redigera"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_Arkiv/_Ta bort"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_Arkiv/_Spara"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Arkiv/St_äng"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Redigera"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Redigera/_Kopiera"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Redigera/Klistra _in"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/A_dress"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/A_dress/Ny _adress"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/A_dress/Ny _grupp"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/A_dress/Ny _mapp"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/A_dress/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/A_dress/_Redigera"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/_A_dress/_Ta bort"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/V_erktyg"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hjälp/_Om"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Ny _adress"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Ny _grupp"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Ny _mapp"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -967,82 +963,88 @@ msgstr "/Ny _mapp"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Ta bort"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopiera..."
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Redigera/Klistra _in"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "E-postadress"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Mapp"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "E-postadress"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Namn:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Till:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Dold kopia:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Slå upp"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 #, fuzzy
 msgid "_Close"
 msgstr "Stäng"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Ta bort adress(er)"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Vill du verkligen ta bort adress(erna)?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1052,36 +1054,36 @@ msgstr ""
 "Tar du bara bort mappen, kommer adresserna att flyttas\n"
 "en mapp uppåt i hierarkin."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "_Folder only"
 msgstr "_Endast mapp"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "Folder and _addresses"
 msgstr "Mapp och _adresser"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Vill du verkligen ta bort \"%s\" ?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Ny användare, kunde inte spara indexfil."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Ny användare, kunde inte spara adressboksfiler."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Den gamla adressboken är konverterad."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1089,7 +1091,7 @@ msgstr ""
 "Gammal adressbok konverterad,\n"
 "kunde inte spara ny adressindexfil"
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1097,7 +1099,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "men skapade nya tomma adressboksfiler."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1105,7 +1107,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1113,91 +1115,85 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "och kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adressboksfel"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Kunde inte läsa adressindex"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr "Gammal adressbok konverterad, kunde inte skapa ny adressindexfil"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Kunde inte konvertera adressbok, men skapade nya tomma adressboksfiler."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Kunde inte konvertera adressbok, kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Kunde inte konvertera adressbok och kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Grupp"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Mapp"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "LDAP-server"
 
@@ -1209,15 +1205,15 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Notera"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Varning"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Fel"
 
@@ -1260,7 +1256,7 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Ingen"
 
@@ -1600,8 +1596,8 @@ msgstr "Meddelande: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Kan inte läsa delen av multipart-meddelandet."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Inget Ämne)"
 
@@ -1794,7 +1790,7 @@ msgstr "MIME-typ"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Storlek"
 
@@ -2037,12 +2033,12 @@ msgstr "Redigera mapp"
 msgid "Input the new name of folder:"
 msgstr "Skriv in det nya namnet på mappen:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Ny mapp"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
@@ -2188,7 +2184,7 @@ msgstr "Exportera"
 msgid "Specify source folder and destination file."
 msgstr "Välj mbox-målfil och destinationskatalog."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Datumformat"
@@ -2203,7 +2199,7 @@ msgstr "Ursprungskatalog:"
 msgid "Destination:"
 msgstr "Destinationskatalog:"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2215,7 +2211,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Välj... "
@@ -2276,23 +2272,23 @@ msgstr "Papperskorg"
 msgid "Drafts"
 msgstr "Utkast"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "NyMapp"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "\"%c\" får inte finnas i mappnamn."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen \"%s\" finns redan."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan inte skapa mappen \"%s\"."
@@ -2420,32 +2416,32 @@ msgstr "Letar efter nya meddelanden i alla mappar..."
 msgid "Junk"
 msgstr "Skräp"
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappen %s är vald\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Laddar ner meddelanden i %s ..."
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Laddar ner meddelanden i %s ..."
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 #, fuzzy
 msgid "Download all messages"
 msgstr "Laddar ner meddelanden i %s ..."
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ett fel uppstod vid nedladdning av meddelanden i \"%s\"."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2455,26 +2451,26 @@ msgstr ""
 "(om du vill skapa en mapp som skall innehålla undermappar,\n"
 " lägg till \"/\" vid slutet av namnet)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Skriv in nytt namn på \"%s\":"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Byt namn på mapp"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan inte flytta mappen \"%s\"."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2483,12 +2479,12 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan \"%s\" ?\n"
 "(Meddelandena tas INTE bort från disken)"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Ta bort mapp"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2501,20 +2497,20 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dem?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Töm papperskorgen"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 msgid "Delete all messages in the trash folder?"
 msgstr "Ta bort alla meddelanden i papperskorgen?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2523,34 +2519,34 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan \"%s\" ?\n"
 "(Meddelandena tas INTE bort från disken)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "Ta bort brevlåda"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Vill du verkligen ta bort IMAP4-kontot \"%s\"?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "Ta bort IMAP4-konto"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgrupp \"%s\"?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Ta bort diskussionsgrupp"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgruppskonto \"%s\"?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Ta bort diskussionsgruppskonto"
 
@@ -2562,8 +2558,8 @@ msgstr "Diskussionsgrupper:"
 msgid "Creating header view...\n"
 msgstr "Skapar brevhuvudvy...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Inget Från)"
 
@@ -2575,71 +2571,71 @@ msgstr "Skapar bildvy...\n"
 msgid "Can't load the image."
 msgstr "Kan inte öppna bilden."
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Filen %s finns inte\n"
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Välj mbox-målfil och destinationskatalog."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Söker igenom mapp %s ..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Importera"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Söker igenom mapp %s ..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Fel uppstod vid postning\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Importera"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Välj mbox-målfil och destinationskatalog."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Ursprungskatalog:"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Destinationskatalog:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Ny mapp"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Välj mbox-målfil och destinationskatalog."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Välj fil att importera"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Välj fil att importera"
 
@@ -2800,157 +2796,157 @@ msgstr "Importera LDIF-fil till adressboken"
 msgid "Attributes"
 msgstr "Attribut"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nya meddelanden"
 
-#: src/inc.c:477
+#: src/inc.c:478
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autentiserar"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Hämtar nya meddelanden"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "Vänta"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Hämtar"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Färdig (%d meddelande(n) (%s) mottagna)"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Inga nya meddelanden."
 
-#: src/inc.c:708
+#: src/inc.c:715
 #, fuzzy
 msgid "Done"
 msgstr "Färdig."
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Förbindelse misslyckades"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Autentisering misslyckades"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Låst"
 
-#: src/inc.c:730
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Slut på väntetid"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Avslutad (%d nya meddelanden)"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Avslutad (inga nya meddelanden)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "Fel uppstod vid hämtning av post."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "hämtar nya meddelanden från kontot %s...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autentiserar"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Hämtar nya meddelanden"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Ansluter till POP3-server: %s ..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan inte ansluta till POP3-server: %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentiserar..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Hämtar meddelanden från %s..."
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Tar emot meddelandenas antal (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Tar emot meddelandenas antal (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Tar emot meddelandenas antal (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Tar emot meddelandenas storlek (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "Tar bort meddelande %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Avslutar"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Tar emot meddelande (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 msgid "Connection failed."
 msgstr "Förbindelse misslyckades."
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "Fel uppstod när e-posten behandlades."
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2959,29 +2955,29 @@ msgstr ""
 "Fel uppstod när e-posten behandlades:\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Inget diskutrymme kvar."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "Kan inte skriva fil."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "Fel på uttag (socket)."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Anslutningen stängdes av fjärrvärden."
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "Brevlådan är låst."
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2990,11 +2986,11 @@ msgstr ""
 "Brevlådan är låst:\n"
 "%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Autentisering misslyckades."
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3003,15 +2999,15 @@ msgstr ""
 "Autentisering misslyckades:\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Sessionens väntetid tog slut."
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "Inkorporering avbruten\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Hämtar nya meddelanden från %s till %s...\n"
@@ -3025,24 +3021,20 @@ msgstr "Skriv in lösenord för %s på %s:"
 msgid "Input password"
 msgstr "Skriv in lösenord"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Protokollogg"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread stöds inte av glib.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Användning: %s [FLAGGOR]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adress]    öppna skrivfönster"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3052,23 +3044,23 @@ msgstr ""
 "                         öppna skrivfönster med angivna filer\n"
 "                         bifogade"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive             ta emot nya meddelanden"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all         ta emot nya meddelanden från alla konton"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                skicka alla köade meddelanden"
 
-#: src/main.c:542
+#: src/main.c:554
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mapp]...    visar det totala antalet meddelanden"
 
-#: src/main.c:543
+#: src/main.c:555
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3076,48 +3068,48 @@ msgstr ""
 "  --status-full [mapp]...\n"
 "                          visa status för varje mapp"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:550
+#: src/main.c:562
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug               felsökningsläge"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug               felsökningsläge"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                visa denna hjälp och avsluta"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version             skriv ut versionsinformation och avsluta"
 
-#: src/main.c:557
+#: src/main.c:569
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "eller tryck på \"y\"-tangenten.\n"
 "\n"
 
-#: src/main.c:638
+#: src/main.c:694
 msgid "Filename encoding"
 msgstr "Filnamn kodning"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3141,19 +3133,19 @@ msgstr ""
 "\n"
 "Fortsätt?"
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "Ett skrivet meddelande finns. Avsluta ändå?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Meddelanden i kö"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Några oskickade meddelanden ligger i kö. Avsluta nu?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3161,16 +3153,20 @@ msgstr ""
 "GnuPG är inte installerad riktigt eller så är versionen för gammal.\n"
 "OpenPGP-stöd avstängt."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "en annan instans av Sylpheed är redan igång.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 msgid "Migration of configuration"
 msgstr "Migration av konfiguration"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3830,8 +3826,8 @@ msgstr "Skapar huvudfönster...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Huvudfönster: färgtilldelning %d misslyckades\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "färdigt.\n"
 
@@ -4068,7 +4064,7 @@ msgstr "Bilagor"
 msgid "Message View - Sylpheed"
 msgstr "Meddelandevy - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan inte spara filen \"%s\"."
@@ -6162,19 +6158,19 @@ msgstr "Bilaga"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Ärende"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Från"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Datum"
 
@@ -6184,7 +6180,7 @@ msgid "Number"
 msgstr "Nummer"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 #, fuzzy
 msgid "To"
 msgstr "Till:"
@@ -6487,30 +6483,30 @@ msgstr "%d meddelanden funna.\n"
 msgid "%d messages found."
 msgstr "%d meddelanden funna.\n"
 
-#: src/query_search.c:579
-#, fuzzy, c-format
-msgid "Searching %s ..."
-msgstr "Söker igenom mapp %s ..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrerar..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, fuzzy, c-format
+msgid "Searching %s ..."
+msgstr "Söker igenom mapp %s ..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Inget datum)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Spara i utkastsmapp"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 #, fuzzy
 msgid "Folder name:"
 msgstr "Filnamn"
@@ -6561,7 +6557,7 @@ msgstr ""
 msgid "Signature made at %s\n"
 msgstr "Signatur skapad %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Fel vid verifikation av signatur"
 
@@ -6590,7 +6586,7 @@ msgstr "Om"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Ta bort brevlåda"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "Nr."
 
@@ -6616,58 +6612,58 @@ msgid ""
 "%s"
 msgstr "fel uppstod vid POP3-session\n"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Hämtar meddelandehuvuden (%d / %d)"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Tar emot meddelandenas antal (STAT)..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 #, fuzzy
 msgid "No message"
 msgstr "Inga nya meddelanden."
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Ta bort meddelande(n)"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Avslutar..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Hämtar nya meddelanden"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Skicka meddelande"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Hämtar nya meddelanden"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Hämtar meddelanden från %s..."
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 #, fuzzy
 msgid "Delete messages"
 msgstr "Ta bort meddelande(n)"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6748,67 +6744,67 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Upprättar förbindelse med SMTP-server: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 #, fuzzy
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Fel uppstod när kommandot skickades\n"
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "Skickar HELO..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "Autentiserar"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 msgid "Sending message..."
 msgstr "Skickar meddelande..."
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "Skickar EHLO..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Skickar MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Skickar"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Skickar RCPT TO..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Skickar DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Skickar meddelande (%d / %d byte)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr ""
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "Fel uppstod när meddelandet skickades."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6817,12 +6813,12 @@ msgstr ""
 "Fel uppstod när meddelandet skickades:\n"
 "%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 #, fuzzy
 msgid "Can't connect to SMTP server."
 msgstr "Kan inte ansluta till NNTP-server: %s:%d\n"
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, fuzzy, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Kan inte ansluta till NNTP-server: %s:%d\n"
@@ -6847,70 +6843,70 @@ msgstr "Resultat av signaturundersökning"
 msgid "Checking signature"
 msgstr "Undersöker signatur"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s från \"%s\""
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Ingen signatur funnen"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bra signatur från \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Bra signatur"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Giltig signatur med nyckeln för \"%s\" är inte pålitlig"
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Giltig signatur (opålitlig nyckel)"
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr "Signatur giltig men för gammal för \"%s\""
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 msgid "Signature valid but expired"
 msgstr "Signatur giltig men för gammal"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr "Signaturen giltig men signerande nyckeln för \"%s\" är för gammal"
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr "Signaturen giltig men signerande nyckeln är för gammal"
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr "Signaturen giltig men signerande nyckeln för \"%s\" har återkallats"
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr "Signaturen giltig men signerande nyckeln har återkallats"
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "FELAKTIG signatur"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "Ingen publik nyckel att verifiera signaturen med"
 
@@ -7008,7 +7004,7 @@ msgstr "Kan inte hämta grupplista."
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan inte hämta grupplista."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Färdig."
 
@@ -7138,219 +7134,219 @@ msgstr "Några markeringar finns kvar. Behandla dem?"
 msgid "Scanning folder (%s)..."
 msgstr "Söker igenom mapp (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 msgid "_Search again"
 msgstr "_Sök igen"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Inga fler olästa meddelande"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "Inget oläst meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Inga olästa meddelanden."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "Inget oläst meddelande funnet. Gå till nästa mapp?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Inga fler nya meddelanden"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "Inget nytt meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Inga nya meddelanden."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "Inget nytt meddelande funnet. Gå till nästa mapp?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Inga fler markerade meddelanden"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "Inget markerat meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Inga markerade meddelanden."
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "Inget markerat meddelande funnet. Sök från början?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Inga fler färgade meddelanden"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "Inget färgat meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Inga färgade meddelanden."
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Inget färgat meddelande funnet. Sök från början?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Attraherar meddelanden efter ärende..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d borttagen"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d flyttad"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopierad"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " objekt valda"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nya, %d olästa, %d totalt (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nya, %d olästa, %d totalt"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Sorterar summering..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tSkapar summering från meddelandedata..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Skapar summering från meddelandedata..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Skriver summeringscache (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Meddelande %d är markerat\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Meddelande %d är markerat som läst\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Meddelande %d är markerat som oläst\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Meddelande %s/%d är valt för borttagning\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Ta bort meddelande(n)"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Vill du verkligen tömma papperkorgen?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Tar bort meddelandedubbletter..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Meddelande %s/%d är avmarkerat\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Meddelande %d är valt för att flyttas till %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "Destinationen är samma som aktuell mapp."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Välj mapp"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Meddelandet %d är valt för att kopieras till %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 msgid "Destination for copy is same as current folder."
 msgstr "Destinationen att kopiera till är samma som aktuell mapp."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Välj mapp"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 msgid "Error occurred while processing messages."
 msgstr "Fel uppstod när meddelanden behandlades."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Skapar trådar..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Avtrådar..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "filtrerar..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d meddelande(n) har filtrerats."
@@ -7444,35 +7440,41 @@ msgstr "Skicka köade meddelanden"
 msgid "E_xit"
 msgstr "Avsluta"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "Ingen signatur funnen"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "Serverinformation"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "en annan instans av Sylpheed är redan igång.\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "Kan inte öppna markeringsfil.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "g_thread stöds inte av glib.\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "Fil att importera:"
 
diff --git a/po/tr.po b/po/tr.po
index 5d33338f..0d7a6835 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: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+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,228 +24,228 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Her hesap için yapılandırma dosyaları okunuyor...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "%s adresine yapılmış IMAP4 bağlantısı koptu. Yeniden bağlanılıyor...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP sunucu dizini"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "%s:%d adresine IMAP4 bağlantısı yapılıyor ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "TLS oturumuna bağlantı kurulamadı.\n"
 
-#: libsylph/imap.c:1176
+#: libsylph/imap.c:1230
 #, fuzzy, c-format
-msgid "Getting message %d"
+msgid "Getting message %u"
 msgstr "%d. ileti siliniyor"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "İleti gönderiliyor (%d / %d bayt)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "%s%c%d mesajı %s  içine kopyalanıyor...\n"
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "%s%c%d mesajı %s  içine kopyalanıyor...\n"
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "%s konumundan iletiler alınıyor..."
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "silinen işaretler atanamıyor: %s\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "silinemiyor\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "%s konumundan iletiler alınıyor..."
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 msgid "can't set deleted flags: 1:*\n"
 msgstr "silinen işaretler atanamıyor: 1:*\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "dizin kapatılamadı\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "%s kök dizini bulunamadı\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "LIST alınırken hata oluştu.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "%s oluşturulamadı\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "%s Gelen altında oluşturulamadı\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "posta kutusu yaratılamıyor: Liste hatası\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "posta kutusu oluşturulamadı\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, 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:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "posta kutusu silinemedi\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "zarf alınamadı\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "İleti gönderiliyor (%d / %d bayt)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "zarf alınamadı\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "zarf alınırken bir hata oluştu.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "zarf ayrıştırılamadı: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4 sunucuya bağlantı kurulamadı: %s:%d\n"
 
-#: libsylph/imap.c:2714
+#: libsylph/imap.c:2863
 #, 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:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "alanadına erişilemedi\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "dizin seçilemedi: %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "imap komutu sırasında hata oluştu: CLOSE\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 yetkilendirmesi başarısız.\n"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 girişinde hata.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s, %s üzerine eklenemedi\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(dosya gönderiliyor...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "ileti %s'ye eklenemiyor\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s, %s konumuna kopyalanamadı\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, 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:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "EXPUNGE komutu sırasında hata oluştu\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "imap komutu sırasında hata oluştu: CLOSE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv, UTF-7 yi %s'e çeviremedi\n"
 
-#: libsylph/imap.c:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv %s yi UTF-7'ye çeviremedi\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "geçici dosyaya yazılamadı\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "%s daki mesajlar %s e alınıyor...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "Posta kutusu dosyası okunamıyor.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "geçersiz posta kutusu biçimi: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "bozuk posta kutusu: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "geçici dosya açılamadı\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -254,67 +254,63 @@ msgstr ""
 "uygun olmayan Kimden:\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "kilit dosyası yaratılamadı: %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "file yerine flock kullanmayı deneyin.\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "%s oluşturulamadı\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr ""
 "posta kutusu başka bir süreç tarafından kullanıldığı için bekleniyor...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "%s kilitlenemedi\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "geçersiz kilit türü\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "%s açılamadı\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "posta kutusu sıfırlanamıyor.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "%s daki mesajlar %s a aktarılıyor...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "mesaj %s dan %s a kopyalanamadı\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "işaretli dosya açılamadı.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "kaynak dizini hedef dizinle aynı.\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "%s%c%d mesajı %s  içine kopyalanıyor...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -323,7 +319,7 @@ msgstr ""
 "%s dosyası zaten bulunuyor.\n"
 "Dizin oluşturulamadı."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -335,77 +331,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "%s:%d adresine NNTP bağlantısı yapılıyor...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 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:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "%d iletisi zaten önbelleklendi.\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "%d. makale alınıyor...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "%d. makale okunamadı\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "makale postalanamıyor.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "makale alınamıyor : %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "grup seçilemiyor: %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "geçersiz makale aralığı: %d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "yeni makale yok.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "%d - %d haber grubu alınıyor (%s)...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "haber grupları alınamadı\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "haber grupları alınırken hata.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "hatalı haber grubu satırı %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "X başlıkları alınamıyor\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "x başlıkları alınırken hata oluştu.\n"
 
@@ -463,27 +459,27 @@ msgstr "POP3: Eski postalar siliniyor %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Posta atlanıyor %d (%d byte)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "posta kutusu kilitli\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "oturum zaman aşımına uğradı\n"
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "TLS oturumu başlatılamıyor\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "yetkilendirme sırasında hata oluştu\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "komut desteklenmiyor\n"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "POP3 oturumunda hata oluştu\n"
 
@@ -516,16 +512,16 @@ msgstr "dizin:"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Kod çevriminde hata.\n"
 
-#: libsylph/procmsg.c:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "işaret dosyası açılamadı\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "%d. ileti alınamadı\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Yazdırma komutu geçersiz: `%s'\n"
@@ -678,7 +674,7 @@ msgstr ""
 "kutucukları tıklanarak bu hesaplar için `Hepsini al' seçeneğini \n"
 "etkin duruma getirilebilir."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -821,7 +817,7 @@ msgstr "Adres Defterine Ekle"
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Notlar"
@@ -830,29 +826,29 @@ msgstr "Notlar"
 msgid "Select Address Book Folder"
 msgstr "Adres Defteri Dizinini Seç"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Dosya"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_Dosya/Yeni _Defter"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_Dosya/Yeni _vCard"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/_Dosya/Yeni _JPilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Dosya/Yeni _Sunucu"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -860,101 +856,101 @@ msgstr "/_Dosya/Yeni _Sunucu"
 msgid "/_File/---"
 msgstr "/_Dosya/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_Dosya/_Düzenle"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_Dosya/_Sil"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_Dosya/_Kaydet"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Dosya/K_apat"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Dü_zenle"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Dü_zenle/K_opyala"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/Dü_zenle/_Yapıştır"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/_Adres/Yeni _Adres"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/_Adres/Yeni _Grup"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/_Adres/Yeni _Dizin"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/_Adres/Dü_zenle"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Sil"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/A_raçlar"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/A_raçlar/_LDIF dosyasını ekle"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/A_raçlar/_LDIF dosyasını ekle"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Yardım/_Hakkında"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Yeni _Adres"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Yeni _Grup"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Yeni _Dizin"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -967,82 +963,88 @@ msgstr "/Yeni _Dizin"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Sil"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopyala..."
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 #, fuzzy
 msgid "/_Paste"
 msgstr "/Dü_zenle/_Yapıştır"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "İleti adresi"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adres defteri"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Dizin"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "İleti adresi"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "İsim:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Kime:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Sil"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Ekle"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Ara"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 #, fuzzy
 msgid "_Close"
 msgstr "Kapat"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Adres(ler)i sil"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Adres(ler) silinsin mi?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1052,38 +1054,38 @@ msgstr ""
 "misiniz?\n"
 "Eğer sadece dizini silerseniz, içindeki adresler ana dizine taşınacaktır."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Dizini sil"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 #, fuzzy
 msgid "_Folder only"
 msgstr "Sadece dizin"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Dizin ve Adresler"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "`%s' silinsin mi?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Yeni kullanıcı, indeks dosyası kaydedilemedi."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Yeni kullanıcı, adres defteri dosyaları kaydedilemedi."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Eski adres defteri başarıyla çevrildi."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1091,7 +1093,7 @@ msgstr ""
 "Eski adres defteri çevrildi,\n"
 "yeni adres indeks dosyası kaydedilemedi"
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1099,7 +1101,7 @@ msgstr ""
 "Adres defteri çevrilemedi,\n"
 "ancak boş bir adres defteri dosyası oluşturuldu."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1107,7 +1109,7 @@ msgstr ""
 "Adres defteri ve yeni adres defteri \n"
 "dosyası oluşturulamadı."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1115,94 +1117,88 @@ msgstr ""
 "Adres defteri ve yeni adres defteri \n"
 "dosyası oluşturulamadı."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adres defteri çevrimi"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adres Defteri Hatası"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Adres indeksi okunamadı"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Eski adres defteri çevrildi, ancak yeni adres indeks dosyası kaydedilemedi"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Adres defteri çevrilemedi, ancak yeni ve boş bir adres defteri dosyası "
 "oluşturuldu."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Adres defteri çevrilemedi ve yeni adres defteri dosyası oluşturulamadı."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Adres defteri çevrilemedi ve yeni adres defteri dosyası oluşturulamadı."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Adres Defteri Çevrim Hatası"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adres Defteri Çevrimi"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Arayüz"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adres Defteri"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Kişi"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "İleti Adresi"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Grup"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Dizin"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "LDAP Sunucu"
 
@@ -1214,15 +1210,15 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Not"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Uyarı"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Hata"
 
@@ -1265,7 +1261,7 @@ msgstr "Kahverengi"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Hiçbiri"
 
@@ -1629,8 +1625,8 @@ msgstr "İleti: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Çok parçalı mesajın bir kısmı alınamadı"
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Konu yok)"
 
@@ -1822,7 +1818,7 @@ msgstr "MIME türü"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Boyut"
 
@@ -2071,12 +2067,12 @@ msgstr "Dizini düzenle"
 msgid "Input the new name of folder:"
 msgstr "Dizinin yeni adıni girin:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Yeni dizin"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Yeni dizinin adını verin:"
 
@@ -2222,7 +2218,7 @@ msgstr "Aktar"
 msgid "Specify source folder and destination file."
 msgstr "Kaynak ve hedef mbox dosyalarını belirtin."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Tarih biçimi"
@@ -2237,7 +2233,7 @@ msgstr "Kaynak dizini:"
 msgid "Destination:"
 msgstr "Hedef dizini:"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2249,7 +2245,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Seç... "
@@ -2311,23 +2307,23 @@ msgstr "Çöp"
 msgid "Drafts"
 msgstr "Taslaklar"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "YeniDizin"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' bir dizin adı içinde olamaz."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' dizini zaten var."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' dizini oluşturulamıyor."
@@ -2456,32 +2452,32 @@ msgstr "Dizinlerde yeni mesajlar kontrol ediliyor..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s dizini seçildi\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "İletiler %s içine indiriliyor..."
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "İletiler %s içine indiriliyor..."
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 #, fuzzy
 msgid "Download all messages"
 msgstr "İletiler %s içine indiriliyor..."
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "İletiler `%s' içine indirilirken hata oluştu."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2491,26 +2487,26 @@ msgstr ""
 "(Eğer alt dizin içerecek bir dizin oluşturmak \n"
 "istiyorsanız, adının sonuna `/' karakteri getirin)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' için yeni bir isim verin:"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Dizini yeniden adlandır"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2519,12 +2515,12 @@ msgstr ""
 "`%s' posta kutusu kaldırılsın mı?\n"
 "(İletiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Dizini sil"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2535,21 +2531,21 @@ msgstr ""
 "`%s' altındaki tüm dizinler ve mesajlar silinecek.\n"
 "Devam etmek istediğinizden emin misiniz?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Çöpü boşalt"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2558,34 +2554,34 @@ msgstr ""
 "`%s' posta kutusu kaldırılsın mı?\n"
 "(İletiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "Posta kutusunu sil"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "`%s' IMAP4 hesabı silinsin mi?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hesabını sil"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "`%s' haber grubu silinsin mi?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Haber grubunu sil"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "`%s' haber grubu hesabı silinsin mi?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Haber grubu hesabını sil"
 
@@ -2597,8 +2593,8 @@ msgstr "Haber grupları:"
 msgid "Creating header view...\n"
 msgstr "Başlık görünümü oluşturuluyor...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Kimden satırı yok)"
 
@@ -2610,71 +2606,71 @@ msgstr "Resim görüntüsü oluşturuluyor...\n"
 msgid "Can't load the image."
 msgstr "Resim yüklenemedi."
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Kaynak ve hedef mbox dosyalarını belirtin."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "%s dizini taranıyor..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Dışarıdan Aktar"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "%s dizini taranıyor..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Postalama sırasında hata\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Dışarıdan Aktar"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Kaynak ve hedef mbox dosyalarını belirtin."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Kaynak dizini:"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Hedef dizini:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Yeni dizin"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Kaynak ve hedef mbox dosyalarını belirtin."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Eklenecek dosyayı seçin"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Eklenecek dosyayı seçin"
 
@@ -2835,157 +2831,157 @@ msgstr "LDIF dosyasını Adres Defterine aktar"
 msgid "Attributes"
 msgstr "Özellikler"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Tamamlandı (%d yeni mesaj)"
 
-#: src/inc.c:477
+#: src/inc.c:478
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr " Kimlik denetimi"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Yeni iletiler alınıyor"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "Bekle"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "İptal edildi"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Alınıyor"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Tamamlandı (%d mesaj, (%s) alındı)"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Yeni ileti yok."
 
-#: src/inc.c:708
+#: src/inc.c:715
 #, fuzzy
 msgid "Done"
 msgstr "Tamamlandı."
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Bağlantıda hata"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Kimlik denetiminde hata"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Kilitli"
 
-#: src/inc.c:730
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Zaman aşımı"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Tamamlandı (%d yeni mesaj)"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Tamamlandı (yeni mesaj yok)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr " İletiler alınırken bazı hatalar oluştu."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s hesabındaki yeni iletiler alınıyor...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr " Kimlik denetimi"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Yeni iletiler alınıyor"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3 sunucusuna bağlantı kuruluyor: %s ..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3 sunucuya bağlantı kurulamadı: %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Kimlik denetimi yapılıyor..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s konumundan iletiler alınıyor..."
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Yeni ileti numaraları alınıyor (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Yeni ileti numaraları alınıyor (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Yeni ileti numaraları alınıyor (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "İletilerin boyutları alınıyor (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d. ileti siliniyor"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Çıkılıyor"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "İletiler alınıyor (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 msgid "Connection failed."
 msgstr "Bağlantıda hata oluştu."
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "İletiler işlenirken bir hata oluştu."
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2994,29 +2990,29 @@ msgstr ""
 "E-posta işlenirken hata oluştu:\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Yeterli disk alanı kalmadı."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "Dosyaya yazılamadı."
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "protokol hatası"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Bağlantı karşı taraftan kesildi."
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "Posta kutusu kilitli"
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3025,11 +3021,11 @@ msgstr ""
 "Posta kutusu kilitli:\n"
 "%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Yetkilendirmede hata oluştu."
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3038,15 +3034,15 @@ msgstr ""
 "Yetkilendirme başarısız:\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Oturum zaman aşımına uğradı."
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "İptal edildi\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s'den yeni mesajlar %s e alınıyor...\n"
@@ -3060,24 +3056,20 @@ msgstr "%s@%s için parola giriniz:"
 msgid "Input password"
 msgstr "Parolayı girin"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Protokol günlüğü"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread, glib tarafından desteklenmiyor.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Kullanım: %s [SEÇENEKLER] ...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]    düzenleme penceresini açar"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3087,23 +3079,23 @@ msgstr ""
 "                         düzenleme penceresini belirtilen dosyalar\n"
 "                         postaya eklenmiş halde açar"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive               yeni mesajları alır"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          tüm hesaplardaki yeni mesajları alır"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 kuyruktaki postaları gönderir"
 
-#: src/main.c:542
+#: src/main.c:554
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [dizin]...   toplam mesaj sayısını göster"
 
-#: src/main.c:543
+#: src/main.c:555
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3111,49 +3103,49 @@ msgstr ""
 "  --status-full [dizin]...\n"
 "                         her dizinin durumunu göster"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:550
+#: src/main.c:562
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                hata ayıklama modu"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                hata ayıklama modu"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 bu yardımı gösterir ve çıkar"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              sürüm bilgisini gösterir ve çıkar"
 
-#: src/main.c:557
+#: src/main.c:569
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "ya da `y' tuşuna basın.\n"
 "\n"
 
-#: src/main.c:638
+#: src/main.c:694
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Giden ileti kod kümesi"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3167,19 +3159,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "Mesajı göndermeden çıkmak istediğinizden emin misiniz?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Kuyruktaki iletiler"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hala gönderilmemiş bazı iletiler kuyrukta bekliyor. Şimdi çıkılsın mı?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3187,17 +3179,21 @@ msgstr ""
 "GnuPG düzgün kurulmamış veya versiyonu çok eski\n"
 "OpenPGP desteği kapatıldı."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "Başka bir Sylpheed sistemde çalışıyor.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Eylem ayarları"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3870,8 +3866,8 @@ msgstr "Yeni pencere oluşturuluyor...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "AnaPencere: renk bölüştürmesi %d sırasında hata oluştu\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "bitti.\n"
 
@@ -4110,7 +4106,7 @@ msgstr "Ekler"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' dosyası kaydedilemedi."
@@ -6236,19 +6232,19 @@ msgstr "Ek"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Konu"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Kimden"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Tarih"
 
@@ -6258,7 +6254,7 @@ msgid "Number"
 msgstr "Numara"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 #, fuzzy
 msgid "To"
 msgstr "Kime:"
@@ -6560,30 +6556,30 @@ msgstr "%d ileti bulundu.\n"
 msgid "%d messages found."
 msgstr "%d ileti bulundu.\n"
 
-#: src/query_search.c:579
-#, fuzzy, c-format
-msgid "Searching %s ..."
-msgstr "%s dizini taranıyor..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtreleniyor..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, fuzzy, c-format
+msgid "Searching %s ..."
+msgstr "%s dizini taranıyor..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Tarih Yok)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Taslak dizinine kaydet"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 #, fuzzy
 msgid "Folder name:"
 msgstr "Dosya adı"
@@ -6634,7 +6630,7 @@ msgstr ""
 msgid "Signature made at %s\n"
 msgstr "İmza atılma tarihi %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "İmza doğrulanırken hata"
 
@@ -6663,7 +6659,7 @@ msgstr "Hakkında"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Posta kutusunu sil"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "Hayır."
 
@@ -6689,58 +6685,58 @@ msgid ""
 "%s"
 msgstr "POP3 oturumunda hata oluştu\n"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "İleti gönderiliyor (%d / %d bayt)"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Yeni ileti numaraları alınıyor (STAT)..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 #, fuzzy
 msgid "No message"
 msgstr "Yeni ileti yok."
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "İletileri  sil"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Çıkılıyor..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Yeni iletiler alınıyor"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "İletiyi gönder"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Yeni iletiler alınıyor"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "%s konumundan iletiler alınıyor..."
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 #, fuzzy
 msgid "Delete messages"
 msgstr "İletileri  sil"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6817,67 +6813,67 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "SMTP sunucuya bağlantı kuruluyor: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 #, fuzzy
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Komut gönderilirken hata oluştu\n"
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "HELO gönderiliyor..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr " Kimlik denetimi"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 msgid "Sending message..."
 msgstr "İleti gönderiliyor..."
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "EHLO gönderiliyor... "
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM gönderiliyor..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Gönderiliyor"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO gönderiliyor..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "DATA gönderiliyor..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "İleti gönderiliyor (%d / %d bayt)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr ""
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "İleti gönderiliyor"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "İleti gönderilirken hata oluştu."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6886,12 +6882,12 @@ msgstr ""
 "İleti gönderilirken hata oluştu:\n"
 "%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 #, fuzzy
 msgid "Can't connect to SMTP server."
 msgstr "NNTP sunucuya bağlantı yapılamadı: %s:%d\n"
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, fuzzy, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "NNTP sunucuya bağlantı yapılamadı: %s:%d\n"
@@ -6919,71 +6915,71 @@ msgstr "İmza kontrol sonuçlarını ek pencerede göster"
 msgid "Checking signature"
 msgstr "İmza kontrol ediliyor"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s - \"%s\""
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "İmza bulunamadı"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "\"%s\"'ten iyi imza"
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "İyi imza"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr ""
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 #, fuzzy
 msgid "Signature valid but expired"
 msgstr "İmza atılma tarihi %s\n"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr ""
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr ""
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr ""
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr ""
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\" ten hatalı imza"
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "KÖTÜ imza"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "İmzayı kontrol etmek için genel anahtar bulunamadı"
 
@@ -7081,7 +7077,7 @@ msgstr "Haber grubu listesi alınamadı."
 msgid "Can't retrieve newsgroup list."
 msgstr "Haber grubu listesi alınamadı."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Tamamlandı."
 
@@ -7217,220 +7213,220 @@ msgstr "Bazı işaretler bırakılmış. İşlemeye devam edilsin mi?"
 msgid "Scanning folder (%s)..."
 msgstr "Dizin taranıyor (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 #, fuzzy
 msgid "_Search again"
 msgstr "Yeniden ara"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Başka okunmamış ileti yok"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "Okunmamış ileti bulunamadı. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Okunmamış ileti yok."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "Okunamamış ileti yok. Diğer dizine geçilsin mi?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Başka ileti yok"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "Yeni ileti yok. Sondan itibaren aransın mı?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Yeni ileti yok."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "Yeni ileti yok. Sonraki dizine geçilsin mi?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Başka işaretlenmiş posta yok"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "İşaretlenmiş ileti bulunamadı. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "İşaretlenmiş ileti yok."
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "İşaretlenmiş ileti bulunamadı. Baştan aratılsın mı?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Başka etiketlenmiş ileti yok"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "Başka etiketlenlenmiş ileti yok. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Başka etiketlenmiş ileti yok."
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Etkiketlenmiş ileti bulunamadı. Baştan aratılsın mı?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Konularına göre postalar çekiliyor..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d silindi"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d taşındı"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopyalandı"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " öğe seçildi"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d yeni, %d okunmamış, toplam %d (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d yeni, %d okunmamış, toplam %d"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Özet sıralanıyor..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tİleti bilgisinden özet atanıyor..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "İleti bilgisinden özet atanıyor..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Özet (%s) önbelleğe yazılıyor..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "%d. ileti işaretli\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "%d. ileti okunmuş olarak işaretli\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "%d ileti okunmamış olarak işaretli\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "%s/%d ileti silinecek\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "İletileri  sil"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Çöpteki iletileri silmek istiyor musunuz?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Çift iletiler siliniyor..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "%s%d iletisinin işareti kaldırıldı\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "%d iletisi %s e taşındı\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "Hedef dizin şuanki dizinle aynı."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Dizini seç"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "%d iletisi %s e kopyalanadı\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 msgid "Destination for copy is same as current folder."
 msgstr "Kopya için hedef dizin geçerli dizin ile aynı."
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Dizini seç"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 msgid "Error occurred while processing messages."
 msgstr "İletiler işlenirken hata oluştu."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Konumlar oluşturuluyor..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Konumlar ayrılıyor..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtreleniyor..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "filtreleniyor..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Filtreleniyor..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mesaj filtrelenedi."
@@ -7528,36 +7524,42 @@ msgstr "Kuyruktaki iletileri gönder"
 msgid "E_xit"
 msgstr "Çık"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Eski Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "İmza bulunamadı"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "Sunucu bilgisi"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "Başka bir Sylpheed sistemde çalışıyor.\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "işaretli dosya açılamadı.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "g_thread, glib tarafından desteklenmiyor.\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "Dosya aktarılıyor:"
 
diff --git a/po/uk.po b/po/uk.po
index 87077a9f..eb09a3b3 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-12 23:53+0300\n"
+"POT-Creation-Date: 2009-10-29 11:23+0900\n"
 "PO-Revision-Date: 2009-10-12 23:57+0300\n"
 "Last-Translator: O.R. Nykyforchyn <oleh.nyk@gmail.com>\n"
 "Language-Team: Ukrainian\n"
@@ -42,176 +42,176 @@ msgstr "створення з'єднання IMAP4 до %s:%d ...\n"
 msgid "Can't start TLS session.\n"
 msgstr "Не вдалось почати сесію TLS.\n"
 
-#: libsylph/imap.c:1227
-#, c-format
-msgid "Getting message %d"
+#: libsylph/imap.c:1230
+#, fuzzy, c-format
+msgid "Getting message %u"
 msgstr "Отримуємо лист %d"
 
-#: libsylph/imap.c:1343
+#: libsylph/imap.c:1346
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Приєднуємо листи до %s (%d / %d)"
 
-#: libsylph/imap.c:1466
+#: libsylph/imap.c:1469
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Переносимо листи %s в %s ..."
 
-#: libsylph/imap.c:1471
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Копіюємо листи %s в %s ..."
 
-#: libsylph/imap.c:1609
+#: libsylph/imap.c:1612
 #, c-format
 msgid "Removing messages %s"
 msgstr "Видаляємо листи від %s"
 
-#: libsylph/imap.c:1615
+#: libsylph/imap.c:1618
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "не вдалось встановити прапорець видалення: %s\n"
 
-#: libsylph/imap.c:1623 libsylph/imap.c:1718
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "не вдалось очистити папку від видалених листів\n"
 
-#: libsylph/imap.c:1706
+#: libsylph/imap.c:1709
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Видаляємо всі листи у %s"
 
-#: libsylph/imap.c:1712
+#: libsylph/imap.c:1715
 msgid "can't set deleted flags: 1:*\n"
 msgstr "не вдалось встановити прапорець видалення: 1:*\n"
 
-#: libsylph/imap.c:1760
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "не вдалось закрити папку\n"
 
-#: libsylph/imap.c:1839
+#: libsylph/imap.c:1842
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "коренева папка %s не існує\n"
 
-#: libsylph/imap.c:2039 libsylph/imap.c:2047
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "помилка при отриманні LIST'а.\n"
 
-#: libsylph/imap.c:2278
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Не вдалось створити '%s'\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Не вдалось створити '%s' всередині INBOX\n"
 
-#: libsylph/imap.c:2345
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "не вдалось створити скриньку: невдача LIST\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "не вдалось створити скриньку\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2499
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "не вдалось перейменувати скриньку: %s на %s\n"
 
-#: libsylph/imap.c:2576
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "не вдалось видалити скриньку\n"
 
-#: libsylph/imap.c:2605
+#: libsylph/imap.c:2608
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Отримуємо заголовки листів (%d / %d)"
 
-#: libsylph/imap.c:2639
+#: libsylph/imap.c:2642
 msgid "can't get envelope\n"
 msgstr "не вдалось отримати конверт\n"
 
-#: libsylph/imap.c:2668
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "трапилась помилка при отриманні конверта.\n"
 
-#: libsylph/imap.c:2689
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "не вдалось розібрати конверт: %s\n"
 
-#: libsylph/imap.c:2846 libsylph/imap.c:2852
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не вдалось з'єднатись з сервером IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2860
+#: libsylph/imap.c:2863
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Не вдалось встановити сесію IMAP4 з: %s:%d\n"
 
-#: libsylph/imap.c:2935
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "не вдалось отримати простір імен\n"
 
-#: libsylph/imap.c:3468
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "не вдалось отримати папку: %s\n"
 
-#: libsylph/imap.c:3503
+#: libsylph/imap.c:3506
 msgid "error on imap command: STATUS\n"
 msgstr "помилка при виконанні команди imap: STATUS\n"
 
-#: libsylph/imap.c:3626 libsylph/imap.c:3661
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "Невдача авторизації IMAP4.\n"
 
-#: libsylph/imap.c:3710
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "Невдача авторизації IMAP4.\n"
 
-#: libsylph/imap.c:4075
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не вдалось додати %s до %s\n"
 
-#: libsylph/imap.c:4082
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(посилаємо файл...)"
 
-#: libsylph/imap.c:4111
+#: libsylph/imap.c:4114
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "не вдалось приєднати лист до %s\n"
 
-#: libsylph/imap.c:4143
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не вдалось скопіювати %s в %s\n"
 
-#: libsylph/imap.c:4167
+#: libsylph/imap.c:4170
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "помилка при виконанні команди imap:  STORE %s %s\n"
 
-#: libsylph/imap.c:4181
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "помилка при виконанні команди imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4194
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "помилка при виконанні команди imap: CLOSE\n"
 
-#: libsylph/imap.c:4493
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не може конвертувати UTF-7 в %s\n"
 
-#: libsylph/imap.c:4523
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може конвертувати %s в UTF-7\n"
@@ -293,21 +293,21 @@ msgstr "не вдалось обрізати скриньку до нуля.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Експортуємо листи з %s в %s...\n"
 
-#: libsylph/mh.c:508
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "не вдалось копіювати %s в %s\n"
 
-#: libsylph/mh.c:702 libsylph/mh.c:820
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "папка призначення ідентична до вихідної.\n"
 
-#: libsylph/mh.c:823
+#: libsylph/mh.c:824
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Копіюємо лист %s/%d в %s ...\n"
 
-#: libsylph/mh.c:1186 libsylph/mh.c:1199 src/main.c:180
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -316,7 +316,7 @@ msgstr ""
 "Файл `%s' вже існує.\n"
 "Неможливо створити папку."
 
-#: libsylph/mh.c:1761
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -347,67 +347,67 @@ msgstr "створюємо з'єднання NNTP до %s:%d ...\n"
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "З'єднання NNTP до %s:%d було розірвано. Відновлюємо...\n"
 
-#: libsylph/news.c:386
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "статтю %d вже кешовано.\n"
 
-#: libsylph/news.c:406
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "отримуємо статтю %d...\n"
 
-#: libsylph/news.c:410
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "не вдалось прочитати статтю %d\n"
 
-#: libsylph/news.c:685
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "не вдалось послати статтю.\n"
 
-#: libsylph/news.c:711
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "не вдалось отримати статтю %d\n"
 
-#: libsylph/news.c:768
+#: libsylph/news.c:770
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "не вдалось обрати конференцію: %s\n"
 
-#: libsylph/news.c:805
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "невірний діапазон статей: %d - %d\n"
 
-#: libsylph/news.c:818
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "нових статтей нема.\n"
 
-#: libsylph/news.c:828
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "отримуємо xover %d - %d в %s...\n"
 
-#: libsylph/news.c:832
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "не вдалось отримати xover\n"
 
-#: libsylph/news.c:842
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "трапилась помилка при отриманні xover.\n"
 
-#: libsylph/news.c:852
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "невірний рядок xover: %s\n"
 
-#: libsylph/news.c:871 libsylph/news.c:903
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "не вдалось отримати xhdr\n"
 
-#: libsylph/news.c:883 libsylph/news.c:915
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "трапилась помилка при отриманні xhdr.\n"
 
@@ -519,12 +519,12 @@ msgstr "procmime_get_text_content(): Перетворення кодів не в
 msgid "can't open mark file\n"
 msgstr "не вдалось відкрити файл позначок\n"
 
-#: libsylph/procmsg.c:1332
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "не вдалось стягти лист %d\n"
 
-#: libsylph/procmsg.c:1571
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Невірна команда друку: `%s'\n"
@@ -679,7 +679,7 @@ msgstr ""
 "Порядок перевірки нових листів. Позначте в колонці `G'\n"
 "account'и, які поповнюються через `Отримати всі'."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -820,7 +820,7 @@ msgstr "Додати адресу до книги"
 msgid "Address"
 msgstr "Адреса"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Нотатки"
@@ -829,28 +829,28 @@ msgstr "Нотатки"
 msgid "Select Address Book Folder"
 msgstr "Обрати папку адресної книги"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Файл"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/Файл/Нова книга"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/Файл/Нова vCard"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/Файл/Новий JPilot"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новий сервер LDAP"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -858,100 +858,100 @@ msgstr "/Файл/Новий сервер LDAP"
 msgid "/_File/---"
 msgstr "/Файл/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/Файл/Редагувати"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/Файл/Видалити"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/Файл/Зберегти"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Файл/Закрити"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Редагувати"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Редагувати/Копіювати"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/Редагувати/Вставити"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/Адреса"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/Адреса/Нова адреса"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/Адреса/Нова група"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/Адреса/Нова папка"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/Адреса/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/Адреса/Редагувати"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/Адреса/Видалити"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Інструменти"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Інструменти/Імпортувати файл LDIF"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 msgid "/_Tools/Import _CSV file"
 msgstr "/Інструменти/Імпортувати файл CSV"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Допомога"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Допомога/Про програму"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Нова адреса"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/Нова група"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Нова папка"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -964,79 +964,85 @@ msgstr "/Нова папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/Видалити"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 msgid "/_Copy"
 msgstr "/Копіювати"
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 msgid "/_Paste"
 msgstr "/Вставити"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "Адреса e-mail"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Папка"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "Адреса e-mail"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ім'я:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Копія:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Приховано:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Видалити"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Додати"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Пошук"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 msgid "_Close"
 msgstr "Закрити"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Видалити адресу(и)"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Дійсно видалити адресу(и)?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1045,36 +1051,36 @@ msgstr ""
 "Чи бажаєте Ви видалити папку ТА всі адреси в `%s' ? \n"
 "Якщо видалити тільки папку, адреси буде перенесено в охоплюючу папку."
 
-#: src/addressbook.c:1643 src/folderview.c:2544
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Видалити папку"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "_Folder only"
 msgstr "Тільки папку"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "Folder and _addresses"
 msgstr "Папку та адреси"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Дійсно видалити `%s' ?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Новий користувач, не вдалось зберегти покажчик."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Новий користувач, не вдалось зберегти адресну книгу."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Стару адресну книгу успішно конвертовано."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1082,7 +1088,7 @@ msgstr ""
 "Стару адресну книгу конвертовано,\n"
 "не вдалось зберегти новий покажчик адрес"
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1090,7 +1096,7 @@ msgstr ""
 "Не вдалось конвертувати адресну книгу,\n"
 "але створено нову (порожню)."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1098,7 +1104,7 @@ msgstr ""
 "Не вдалось ні конвертувати адресну книгу,\n"
 "ні створити нові файли адресної книги."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1106,85 +1112,79 @@ msgstr ""
 "Не вдалось ні конвертувати адресну книгу,\n"
 "ні створити нові файли адресної книги."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 msgid "Address book conversion error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 msgid "Address book conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 msgid "Address Book Error"
 msgstr "Помилка в адресній книзі"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Не вдалось прочитати покажчик адрес"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Стару адресну книгу конвертовано, не вдалось зберегти новий покажчик адрес"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Не вдалось конвертувати адресну книгу, але створено нову (порожню)."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Не вдалось ні конвертувати адресну книгу, ні створити нову."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Не вдалось ні конвертувати адресну книгу, ні створити нову."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 msgid "Address Book Conversion Error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 msgid "Address Book Conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Інтерфейс"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Особа"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Група"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Папка"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1578,7 +1578,7 @@ msgstr "Лист: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Не вдалось отримати одну з частин листа."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:771
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
 #: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Без теми)"
@@ -2250,7 +2250,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може міститись в назві папки."
 
 #: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
-#: src/query_search.c:1136
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка `%s' вже існує."
@@ -2520,7 +2520,7 @@ msgstr "Конференції:"
 msgid "Creating header view...\n"
 msgstr "Створюємо область перегляду заголовка...\n"
 
-#: src/headerview.c:212 src/query_search.c:772 src/rpop3.c:668
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
 #: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Без відправника)"
@@ -3098,15 +3098,15 @@ msgid "Loading plug-ins..."
 msgstr "Завантажуємо плагіни..."
 
 #. remote command mode
-#: src/main.c:1191
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "вже запущено інший Sylpheed.\n"
 
-#: src/main.c:1461
+#: src/main.c:1464
 msgid "Migration of configuration"
 msgstr "Перенесення налаштувань"
 
-#: src/main.c:1462
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -6362,29 +6362,29 @@ msgstr "знайдено 1 лист."
 msgid "%d messages found."
 msgstr "знайдено %d листів."
 
-#: src/query_search.c:583
+#: src/query_search.c:585
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Шукаємо %s (%d / %d)..."
 
-#: src/query_search.c:690
+#: src/query_search.c:709
 #, c-format
 msgid "Searching %s ..."
 msgstr "Шукаємо %s ..."
 
-#: src/query_search.c:780 src/rpop3.c:676 src/summaryview.c:2225
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Без дати)"
 
-#: src/query_search.c:974
+#: src/query_search.c:989
 msgid "Save as search folder"
 msgstr "Зберегти як папку пошуку"
 
-#: src/query_search.c:995
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr "Розташування:"
 
-#: src/query_search.c:1010
+#: src/query_search.c:1025
 msgid "Folder name:"
 msgstr "Ім'я папки:"
 
@@ -6986,6 +6986,7 @@ msgid "Creating summary view...\n"
 msgstr "Створюємо область перегляду списка...\n"
 
 #: src/summaryview.c:641
+#, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Перечитуємо папку (%s) (%d)..."
 
@@ -7306,7 +7307,7 @@ msgstr "Вихід"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
@@ -7314,19 +7315,19 @@ msgstr ""
 "Існує новіша версія Sylpheed.\n"
 "Оновитись зараз?"
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 msgid "New version found"
 msgstr "Знайдено нову версію"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 msgid "Information"
 msgstr "Інформація"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 msgid "Sylpheed is already the latest version."
 msgstr "Sylpheed вже останньої версії."
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr "Не вдалось отримати інформацію про версію."
 
diff --git a/po/vi.po b/po/vi.po
index 73edf1ad..10332305 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: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+0900\n"
 "PO-Revision-Date: 2006-04-16 22:05+0700\n"
 "Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -19,292 +19,288 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Đang đọc mọi cấu hình cho mỗi tài khoản...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Kết nối IMAP4 tới %s đã bị ngắt. Đang kết nối lại...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Máy chủ IMAP4 cấm ĐĂNG NHẬP.\n"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "đang tạo kết nối IMAP4 tới %s:%d ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "Không thể khởi động phiên TLS.\n"
 
-#: libsylph/imap.c:1176
-#, c-format
-msgid "Getting message %d"
+#: libsylph/imap.c:1230
+#, fuzzy, c-format
+msgid "Getting message %u"
 msgstr "Đang lấy thư %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Đang ghép thư vào %s (%d / %d)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Đang chuyển thư %s tới %s ..."
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Đang chép thư %s tới %s ..."
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, c-format
 msgid "Removing messages %s"
 msgstr "Đang xoá thư %s"
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "không thể đặt cờ đã xoá: %s\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "không thể xoá\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Xoá mọi thư trong %s"
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 msgid "can't set deleted flags: 1:*\n"
 msgstr "không thể đặt cờ đã xoá: 1:*\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "không thể đóng thư mục\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, 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:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "xảy ra lỗi khi lấy LIST.\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Không thể tạo '%s'\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Không thể tạo '%s' ở INBOX\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 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:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "không thể tạo hộp thư\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, 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:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "không thể xoá hộp thư\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "không thể lấy phong bì\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Đang lấy header của thư (%d / %d)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "không thể lấy phong bì\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "xảy ra lỗi khi lấy phong bì.\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "không thể phân tích phong bì: %s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, 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:2714
+#: libsylph/imap.c:2863
 #, 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:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "không thể lấy khoảng định danh (namespace)\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "không thể chọn thư mục: %s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 msgid "error on imap command: STATUS\n"
 msgstr "có lỗi khi chạy lệnh imap: STATUS\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "Xác thực IMAP4 thất bại:\n"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "Đăng nhập IMAP4 thất bại.\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "không thể ghep %s vào %s\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(đang gửi tập tin...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "không thể ghép thư vào %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "không thể chép %s tới %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, 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:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "có lỗi khi chạy lệnh imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "có lỗi khi chạy lệnh imap: CLOSE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, 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:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv không thể chuyển %s sang UTF-7\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "không ghi được vào tập tin tạm\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Lấy thư từ %s vào %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "không đọc được tập tin mbox.\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "định dạng mbox không hợp lệ: %s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "mbox có lỗi: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "không mở được tập tin tạm\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
 "%s"
 msgstr ""
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "không tạo được tập tin khoá %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "dùng lệnh 'flock' thay vì 'file' nếu có thể\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "không tạo được %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "hộp thư bị chiếm dụng bởi một tiến trình khác, đang chờ...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "không thể khoá %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "kiểu khoá không hợp lệ\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "không thể mở khoá %s\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "không thể giảm số lượng hộp thư xuống 0.\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Xuất thư từ %s sang %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, 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:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "Không thể mở tập tin đánh đấu.\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 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:676
+#: libsylph/mh.c:824
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Đang chép thư %s%c%d tới %s ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -313,7 +309,7 @@ msgstr ""
 "Tập tin `%s' đã có trước.\n"
 "Không thể tạo thư mục."
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -332,77 +328,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "đang tạo kết nối NNTP tới %s:%d ...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 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:384
+#: libsylph/news.c:388
 #, 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:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "đang lấy văn bản %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "không thể đọc văn bản %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "không thể gửi bài viết.\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "không thể lấy bài viết %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "không chọn được nhóm: %s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, 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:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "không có bài mới.\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "đang lấy xover %d - %d trong %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "không lấy được vover\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "có lỗi khi lấy xover.\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "dòng xover không hợp lệ: %s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "không lấy được xhdr\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "có lỗi khi lấy xhdr.\n"
 
@@ -460,27 +456,27 @@ msgstr "POP3: Đang xoá các thư hết hạn %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Đang bỏ qua thư %d (%d byte)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "hộp thư đã bị khoá\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "phiên làm việc hết giờ\n"
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "không thể khởi động phiên TLS\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "có lỗi khi xác thực\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "lệnh không được hỗ trợ\n"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "có lỗi trong phiên làm việc POP3\n"
 
@@ -512,16 +508,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:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "không thể mở tập tin đánh dấu\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "không thể lấy thư %d\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Lệnh in không hợp lệ: `%s'\n"
@@ -662,7 +658,7 @@ msgstr ""
 "Các thư mới sẽ được kiểm tra theo thứ tự này. Đánh dấu các hộp\n"
 "trên cột `G' để cho phép lấy thư về bằng `Lấy tất cả'."
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -803,7 +799,7 @@ msgstr "Thêm địa chỉ vào sổ"
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Ghi chú"
@@ -812,28 +808,28 @@ msgstr "Ghi chú"
 msgid "Select Address Book Folder"
 msgstr "Chọn thư mục sổ địa chỉ"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Tập tin"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/_Tập tin/_Sổ mới"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/_Tập tin/_vCard mới"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/_Tập tin/_JPilot mới"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 msgid "/_File/New _LDAP Server"
 msgstr "/_Tập tin/_Máy chủ LDAP mới"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -841,101 +837,101 @@ msgstr "/_Tập tin/_Máy chủ LDAP mới"
 msgid "/_File/---"
 msgstr "/_Tập tin/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/_Tập tin/Soạ_n"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/_Tập tin/_Xoá"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/_Tập tin/_Lưu"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Tập tin/Đón_g"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Soạn"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Soạn/_Sao chép"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Soạn/_Dán"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/Đị_a chỉ"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/Đị_a chỉ/Địa chỉ _mới"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/Đị_a chỉ/_Nhóm mới"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/Đị_a chỉ/_Thư mục mới"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/Đị_a chỉ/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/Đị_a chỉ/_Soạn"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/Đị_a chỉ/_Xoá"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Công cụ"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Công cụ/_Nhập tập tin LDIF"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Công cụ/_Nhập tập tin LDIF"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hỗ trợ"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hỗ trợ/_Giới thiệu"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/Địa chỉ _mới"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/_Nhóm mới"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/Thư _mục mới"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -948,82 +944,88 @@ msgstr "/Thư _mục mới"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Xoá"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Sao chép"
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Soạn/_Dán"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "Địa chỉ email"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Sổ địa chỉ"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "Thư mục"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "Địa chỉ email"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Tên:"
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Người nhận:"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Xoá"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Thêm"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "Tra cứu"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 #, fuzzy
 msgid "_Close"
 msgstr "Màu sắc"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "Xoá địa chỉ"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "Thực sự muốn xoá (các) địa chỉ này?"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1032,36 +1034,36 @@ msgstr ""
 "Bạn có muốn xoá thư mục VÀ mọi địa chỉ trong `%s' ?\n"
 "Nếu chỉ xoá thư mục, các địa chỉ sẽ được chuyển đến thư mục cấp cao hơn."
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "Xoá thư mục"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "_Folder only"
 msgstr "_Chỉ thư mục"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "Folder and _addresses"
 msgstr "Thư mục và địa c_hỉ"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Thực sự muốn xoá `%s' ?"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "Người dùng mới, không thể lưu tập tin mục lục."
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "Người dùng mới, không thể lưu các tập tin sổ địa chỉ."
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "Sổ địa chỉ cũ đã được chuyển đổi thành công."
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1069,7 +1071,7 @@ msgstr ""
 "Sổ địa chỉ cũ đã được chuyển,\n"
 "không thể lưu tập tin địa chỉ mới"
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1077,7 +1079,7 @@ msgstr ""
 "Không thể chuyển đổi sổ địa chỉ,\n"
 "nhưng đã tạo các tập tin sổ địa chỉ trống mới."
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1085,7 +1087,7 @@ msgstr ""
 "Không thể chuyển đổi sổ địa chỉ,\n"
 "không thể tạo các tập tin sổ địa chỉ mới."
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1093,94 +1095,88 @@ msgstr ""
 "Không thể chuyển đổi sổ địa chỉ\n"
 "và không thể các tập tin sổ địa chỉ mới."
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Lỗi chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Lỗi sổ địa chỉ"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "Không thể đọc mục lục địa chỉ"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Sổ địa chỉ cũ đã được chuyển đổi, không thể lưu tập tin mục lục địa chỉ mới"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Không thể chuyển đổi sổ địa chỉ, nhưng đã tạo các tập tin sổ địa chỉ trống "
 "mới."
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Không thể chuyển đổi sổ địa chỉ, không thể tạo các tập tin sổ địa chỉ mới."
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Không thể chuyển đổi sổ địa chỉ và không thể tạo các tập tin sổ địa chỉ mới."
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Lỗi chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Giao diện"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Sổ địa chỉ"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "Cá nhân"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "Nhóm"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "Thư mục"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "Máy chủ LDAP"
 
@@ -1192,15 +1188,15 @@ msgstr "Địa chỉ chung"
 msgid "Personal address"
 msgstr "Địa chỉ cá nhân"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "Chú ý"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "Lỗi"
 
@@ -1243,7 +1239,7 @@ msgstr "Nâu"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "Không"
 
@@ -1578,8 +1574,8 @@ msgstr "Thư: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Không thể lấy thành phần cho thư nhiều thành phần."
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(Không tiêu đề)"
 
@@ -1771,7 +1767,7 @@ msgstr "Kiểu MIME"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "Kích thước"
 
@@ -2013,12 +2009,12 @@ msgstr "Sửa thư mục"
 msgid "Input the new name of folder:"
 msgstr "Đặt tên mới cho thư mục:"
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "Thư mục mới"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "Đặt tên cho thư mục mới:"
 
@@ -2164,7 +2160,7 @@ msgstr "Xuất khẩu"
 msgid "Specify source folder and destination file."
 msgstr "Chỉ định tập tin mbox đích và thư mục đến."
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "Định dạng thời gian"
@@ -2179,7 +2175,7 @@ msgstr "Thư mục nguồn:"
 msgid "Destination:"
 msgstr "Thư mục đến:"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2191,7 +2187,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "Chọn... "
@@ -2252,23 +2248,23 @@ msgstr "Thùng rác"
 msgid "Drafts"
 msgstr "Nháp"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "Thư mục mới"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' không được có trong tên thư mục."
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Thư mục `%s' đã có trước."
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Không tạo được thư mục `%s'."
@@ -2395,32 +2391,32 @@ msgstr "Kiểm tra thư mới trong mọi thư mục..."
 msgid "Junk"
 msgstr "Rác"
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Thư mục %s được chọn\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Đang tải thư về trong %s ..."
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Đang tải thư về trong %s ..."
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 #, fuzzy
 msgid "Download all messages"
 msgstr "Đang tải thư về trong %s ..."
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Có lỗi khi tải thư về trong `%s'."
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2430,26 +2426,26 @@ msgstr ""
 "(nếu bạn muốn tạo một thư mục để lưu thư mục con,\n"
 " thêm `/' vào cuối tên)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Đặt tên cho `%s':"
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "Đổi tên thư mục"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Không thể đổi tên thư mục `%s'."
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Không thể di chuyển thư mục `%s'."
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2458,11 +2454,11 @@ msgstr ""
 "Xoá thư mục tìm kiếm `%s' ?\n"
 "Thư sẽ không bị xoá khỏi ổ cứng."
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 msgid "Delete search folder"
 msgstr "Xoá thư mục tìm kiếm"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2475,20 +2471,20 @@ msgstr ""
 "\n"
 "Bạn có thực sự muốn xoá không?"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Không thể xoá thư mục '%s'."
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "Đổi rác"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 msgid "Delete all messages in the trash folder?"
 msgstr "Xoá mọi thư trong thùng rác?"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2497,34 +2493,34 @@ msgstr ""
 "Thực sự muốn xoá hộp thư `%s' ?\n"
 "(Thư sẽ KHÔNG bị xoá khỏi ổ cứng)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "Xoá hộp thư"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Thực sự muốn xoá tài khoản IMAP4 `%s'?"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "Xoá tài khoản IMAP4"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Thực sự muốn xoá nhóm tin `%s'?"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "Xoá nhóm tin"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Thực sự muốn xoá tài khoản tin tức `%s'?"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "Xoá tài khoản tin tức"
 
@@ -2536,8 +2532,8 @@ msgstr "Nhóm tin:"
 msgid "Creating header view...\n"
 msgstr "Đang tạo khung xem header...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(Không rõ người gửi)"
 
@@ -2549,71 +2545,71 @@ msgstr "Đang tạo khung xem ảnh...\n"
 msgid "Can't load the image."
 msgstr "Không thể tải anh."
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Tập tin %s không tồn tại\n"
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Chỉ định tập tin mbox đích và thư mục đến."
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Đang tìm %s ..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "Nhập khẩu"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Đang quét thư mục %s ..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Có lỗi khi gửi\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "Nhập khẩu"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Chỉ định tập tin mbox đích và thư mục đến."
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "Thư mục nguồn:"
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Thư mục đến:"
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Thư mục mới"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Chỉ định tập tin mbox đích và thư mục đến."
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Chọn tập tin nhập khẩu"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "Chọn tập tin nhập khẩu"
 
@@ -2774,157 +2770,157 @@ msgstr "Nhập khẩu tập tin LDIF vào sổ địa chỉ"
 msgid "Attributes"
 msgstr "Thuộc tính"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d thư mới"
 
-#: src/inc.c:477
+#: src/inc.c:478
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Đang xác thực"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "Đang tải về thư mới"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "Đợi"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "Đã bị huỷ bỏ"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "Đang tải về"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Xong (%d thư (%s) nhận được)"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Không có thư mới."
 
-#: src/inc.c:708
+#: src/inc.c:715
 #, fuzzy
 msgid "Done"
 msgstr "Xong."
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "Kết nối thất bại"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "Xác thực thất bại"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "Đã khoá"
 
-#: src/inc.c:730
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Hết giờ"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Hoàn tất (%d thư mới)"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Hoàn tất (không có thư mới)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "Xảy ra một số lỗi khi nhận thư."
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "đang nhận thư mới của tài khoản %s...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Đang xác thực"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Đang nhận thư mới"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Đang kết nối tới máy chủ POP3: %s..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Không thể kết nối tới máy thủ POP3: %s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Đang xác thực..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Đang lấy thư trên %s..."
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Đang xác định số lượng thư mới (STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Đang xác định số lượng thư mới (LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Đang xác định số lượng thư mới (UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "Đang xác định kích thước thư (LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "Đang xoá thư %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "Đang thoát"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Đang lấy thư (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 msgid "Connection failed."
 msgstr "Kết nối thất bại."
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "Có lỗi khi xử lí thư."
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2933,29 +2929,29 @@ msgstr ""
 "Có lỗi khi xử lí thư:\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "Ổ cứng bị đầy."
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "Không thể ghi lên tập tin"
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "Lỗi socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Kết nối bị ngắt bởi máy từ xa."
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "Hộp thư bị khoá."
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2964,11 +2960,11 @@ msgstr ""
 "Hộp thư bị khoá:\n"
 "%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Xác thực thất bại."
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2977,15 +2973,15 @@ msgstr ""
 "Xác thực thất bại:\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Phiên làm việc hết giờ."
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "Sáp nhập bị huỷ bỏ\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Đang lấy thư từ %s vào %s...\n"
@@ -2999,24 +2995,20 @@ msgstr "Nhập mật khẩu cho %s trên %s:"
 msgid "Input password"
 msgstr "Nhập mật khẩu"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "Theo dõi giao thức"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread không được glib hỗ trợ.\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Cách dùng: %s [TUỲ CHỌN]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [địa chỉ]    mở cửa sổ soạn thảo"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3026,23 +3018,23 @@ msgstr ""
 "                         mở cửa sổ soạn thảo với tập tin đính kèm\n"
 "                         đã chỉ định"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              nhận thư mới"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          nhận thư mới từ mọi tài khoản"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 gửi mọi thư đã xếp hàng"
 
-#: src/main.c:542
+#: src/main.c:554
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [thư mục]...   hiện tổng số thư"
 
-#: src/main.c:543
+#: src/main.c:555
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3050,45 +3042,45 @@ msgstr ""
 "  --status-full [thư mục]...\n"
 "                         hiện trạng thái của từng thư mục"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:550
+#: src/main.c:562
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                đóng Sylpheed"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                chế độ gỡ lỗi"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 hiển thị phần giúp đỡ này và thoát"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              đưa ra thông tin phiên bản và thoát"
 
-#: src/main.c:557
+#: src/main.c:569
 #, c-format
 msgid "Press any key..."
 msgstr ""
 
-#: src/main.c:638
+#: src/main.c:694
 msgid "Filename encoding"
 msgstr "Mã của tên tập tin"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3112,19 +3104,19 @@ msgstr ""
 "\n"
 "Tiếp tục?"
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "Đang viết thư. Bạn thực sự muốn thoát?"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "Các thư đang đợi gửi"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Một số thư chưa gửi đã được xếp hàng. Thoát bây giờ?"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3132,16 +3124,20 @@ msgstr ""
 "GnuPG không được cài đặt hoàn hảo, hoặc phiên bản quá cũ.\n"
 "Việc hỗ trợ OpenGPG bị cấm."
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "một tiến trình Sylpheed khác đang chạy.\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 msgid "Migration of configuration"
 msgstr "Di trú cấu hình"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3797,8 +3793,8 @@ msgstr "Đang tạo cửa sổ chính...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Cửa sổ chính: việc cấp màu %d thất bại\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "xong.\n"
 
@@ -4059,7 +4055,7 @@ msgstr "Đính kèm"
 msgid "Message View - Sylpheed"
 msgstr "Khung xem thư - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Không thể lưu tập tin `%s'."
@@ -6128,19 +6124,19 @@ msgstr "Đính kèm"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "Tiêu đề"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "Người gửi"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "Thời gian"
 
@@ -6150,7 +6146,7 @@ msgid "Number"
 msgstr "Số"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 #, fuzzy
 msgid "To"
 msgstr "Người nhận:"
@@ -6450,29 +6446,29 @@ msgstr "Tìm thấy %d thư.\n"
 msgid "%d messages found."
 msgstr "Tìm thấy %d thư.\n"
 
-#: src/query_search.c:579
-#, c-format
-msgid "Searching %s ..."
-msgstr "Đang tìm %s ..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Đang tìm %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, c-format
+msgid "Searching %s ..."
+msgstr "Đang tìm %s ..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(Không ngày tháng)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 msgid "Save as search folder"
 msgstr "Lưu ở dạng thư mục tìm kiếm"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr "Địa điểm:"
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 msgid "Folder name:"
 msgstr "Tên thư mục:"
 
@@ -6519,7 +6515,7 @@ msgstr "\t\taka \"%s\"\n"
 msgid "Signature made at %s\n"
 msgstr "Kí lúc %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "Lỗi khi xác thực chữ kí"
 
@@ -6547,7 +6543,7 @@ msgstr "Giới t_hiệu"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Xoá hộp thư"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "Số "
 
@@ -6573,58 +6569,58 @@ msgid ""
 "%s"
 msgstr "có lỗi trong phiên làm việc POP3\n"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Đang lấy header của thư (%d / %d)"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Đang xác định số lượng thư mới (STAT)..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 #, fuzzy
 msgid "No message"
 msgstr "Không có thư mới."
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Xoá thư"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "Đang thoát..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Đang tải về thư mới"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Gửi thư"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Đang tải về thư mới"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Đang lấy thư trên %s..."
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 #, fuzzy
 msgid "Delete messages"
 msgstr "Xoá thư"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6705,67 +6701,67 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Đang kết nối tới máy chủ SMTP: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 #, fuzzy
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Có gỗi khi gửi lệnh\n"
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "Đang gửi HELO..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "Đang xác thực"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 msgid "Sending message..."
 msgstr "Đang gửi thư..."
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "Đang gửi EHLO..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "Đang gửi MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "Đang gửi"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "Đang gửi RCPT TO..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "Đang gửi DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Đang gửi thư (%d / %d byte)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr ""
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "Đang gửi thư"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "Có lỗi khi gửi thư."
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6774,12 +6770,12 @@ msgstr ""
 "Có lỗi khi gửi thư:\n"
 "%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 #, fuzzy
 msgid "Can't connect to SMTP server."
 msgstr "Không kết nối được với máy chủ NNTP: %s:%d\n"
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, fuzzy, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Không kết nối được với máy chủ NNTP: %s:%d\n"
@@ -6802,70 +6798,70 @@ msgstr "Kết quả kiểm tra chữ kí"
 msgid "Checking signature"
 msgstr "Đang kiểm tra chữ kí"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s từ \"%s\""
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "Không thấy chữ kí nào"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Chữ kí chuẩn từ \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "Chữ kí chuẩn"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Chữ kí hợp lệ nhưng khoá ch \"%s\" không tin cậy"
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Chữ kí hợp lệ (chưa tin cậy)"
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr "Chữ kí hợp lệ nhưng đã hết hạn cho \"%s\""
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 msgid "Signature valid but expired"
 msgstr "Chữ kí hợp lệ nhưng đã hết hạn"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr "Chữ kí hợp lệ nhưng khoá để kí cho \"%s\" đã hết hạn"
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr "Chữ kí hợp lệ nhưng khoá để kí đã hết hạn"
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr "Chữ kí hợp lệ nhưng khoá để kí cho \"%s\" đã bị thu hồi"
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr "Chữ kí hợp lệ nhưng khoá để kí đã bị thu hồi"
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Chữ kí GIẢ từ \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "Chữ kí GIẢ"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "Không có khoá công cộng nào để xác thực chữ kí"
 
@@ -6962,7 +6958,7 @@ msgstr "Đang lấy danh sách nhóm tin..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Không lấy được danh sách nhóm tin."
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "Xong."
 
@@ -7091,219 +7087,219 @@ msgstr "Vẫn còn sót một số dấu. Xử lí chúng?"
 msgid "Scanning folder (%s)..."
 msgstr "Đang quét thư mục (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 msgid "_Search again"
 msgstr "_Tìm lại"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "Không có thêm thư chưa đọc"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "Không thấy thư nào chưa đọc. Tìm từ dưới lên?"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "Không có thư nào chưa đọc."
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "Không thấy thư nào chưa đọc. Chuyển sang thư mục tiếp theo?"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "Không có thêm thư mới"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "Không có thư mới. Tìm từ dưới lên?"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "Không có thư mới."
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "Không thấy thư mới nào. Tìm trong thư mục tiếp theo?"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "Không có thêm thư được đánh dấu"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "Không thấy thư nào được đánh dấu. Tìm từ cuối lên?"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "Không có thư nào được dánh dấu."
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "Không thấy thư nào được đánh dấu. Tìm từ đầu?"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "Không có thêm thư được đánh dấu nào"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "Không thấy nào được gán nhãn. Tìm từ cuối lên?"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "Không có thư được gán nhãn."
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Không thấy thư nào được gán nhãn. Tìm từ đầu?"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "Tập trung thư theo tiêu đề..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "đã xoá %d"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "đã chuyển %s%d"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "đã chép %s%d"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " mục được chọn"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d mới, %d chưa đọc, %d tổng số (%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d mới, %d chưa đọc, %d tổng số"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "Đang sắp xếp bảng tóm tắt..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\tĐang thiết lập tóm tắt từ dữ liệu thư..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "Đang thiết lập tóm tắt từ dữ liệu thư..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Đang ghi bộ đệm cho phần tóm tắt (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Bức thư %d đã được đánh dấu\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Bức thư %d được đánh dấu là đã đọc\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Bức thư %d được đánh dấu là chưa đọc\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Bức thư %s/%d được chọn để xoá\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "Xoá thư"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Bạn có thực sự muốn xoá thư khỏi thùng rác?"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "Đang xoá thư trùng nhau..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Thư %s/%d được bỏ đánh đấu\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Bức thư %d được chọn để chuyển tới %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "Đích đến trùng với thư mục hiện tại."
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Chọn thư mục"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Bức thư %d được chọn để chép đến %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 msgid "Destination for copy is same as current folder."
 msgstr "Đích đến trùng với thư mục hiện tại"
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Chọn thư mục"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 msgid "Error occurred while processing messages."
 msgstr "Có lỗi khi xử lí thư."
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "Đang tạo luồng..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "Đang rời luồng..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Đang lọc (%d / %d)..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "đang lọc..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "Đang lọc..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d thư đã được lọc."
@@ -7393,35 +7389,41 @@ msgstr "_Gửi thư đang đợi"
 msgid "E_xit"
 msgstr "_Thoát"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "Không thấy chữ kí nào"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "Thông tin máy chủ"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "một tiến trình Sylpheed khác đang chạy.\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "Không thể mở tập tin đánh đấu.\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "g_thread không được glib hỗ trợ.\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "Tập tin được nhập:"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 66aa33ec..309f7bd6 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: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+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,228 +20,228 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "正在读取所有帐号的配置...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "到 %s 的 IMAP4 连接已断开。正在重新连接...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP4 服务器目录"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "正在创建到 %s:%d 的 IMAP4 连接...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "无法启动 TLS 会话。\n"
 
-#: libsylph/imap.c:1176
+#: libsylph/imap.c:1230
 #, fuzzy, c-format
-msgid "Getting message %d"
+msgid "Getting message %u"
 msgstr "正在删除邮件 %d"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "正在发送邮件 (%d / %d 字节)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "正在移动邮件 %s%c%d 到 %s ...\n"
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "正在复制邮件 %s%c%d 到 %s ...\n"
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "正在从 %s 获取邮件..."
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "无法设置删除标志：%s\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "无法清除\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "正在从 %s 获取邮件..."
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 msgid "can't set deleted flags: 1:*\n"
 msgstr "无法设置删除标志：1:*\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "无法关闭文件夹\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "根文件夹 %s 不存在\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "获取列表时发生错误。\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "无法创建“%s”\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "无法在收件箱中创建“%s”\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "无法创建邮箱：LIST 失败\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "无法创建邮箱\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "无法将邮箱 %s 重命名为 %s\n"
 
-#: libsylph/imap.c:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "无法删除邮箱\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "无法获取信封\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "正在发送邮件 (%d / %d 字节)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "无法获取信封\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "获取信封时发生错误。\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "无法解析信封：%s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "无法连接到IMAP4服务器：%s:%d\n"
 
-#: libsylph/imap.c:2714
+#: libsylph/imap.c:2863
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "无法连接到IMAP4服务器：%s:%d\n"
 
-#: libsylph/imap.c:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "无法获得名字空间\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "无法选择文件夹：%s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "执行IMAP命令时发生错误：CLOSE\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 验证失败。\n"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 登录失败。\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "无法把 %s 添加到 %s\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "(正在发送文件...)"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "无法追加邮件到 %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "无法将 %s 复制到 %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "执行IMAP命令时发生错误：STORE %s %s\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "执行IMAP命令时发生错误：EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "执行IMAP命令时发生错误：CLOSE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv 无法转换 UTF-7 到 %s\n"
 
-#: libsylph/imap.c:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv 无法转换 %s 到 UTF-7\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "无法写入临时文件\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "正在从 %s 获取邮件到 %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "无法读取 mbox 文件。\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "无效的 mbox 格式：%s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "格式不正确的 mbox：%s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "无法打开临时文件\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -250,66 +250,62 @@ msgstr ""
 "找到没有转码的发件人：\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "无法创建锁文件 %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "如果可能，用“flock”代替“file”。\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "无法创建 %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "另一个进程拥有该邮箱，等待...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "无法锁住 %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "无效的锁类型\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "无法解锁 %s\n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "无法将邮箱删除为空。\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "正在从 %s 导出信件到 %s...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "无法复制邮件 %s 到 %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "无法打开标记文件。\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "源文件夹与目的文件夹是同一个。\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "正在复制邮件 %s%c%d 到 %s ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -318,7 +314,7 @@ msgstr ""
 "文件“%s”已存在。\n"
 "无法创建文件件。"
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -330,77 +326,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "正在创建到 %s:%d 的NNTP连接...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "到 %s:%d 的NNTP连接已断开。正在重新连接...\n"
 
-#: libsylph/news.c:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "文章 %d 已被缓存。\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "正在下载文章 %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "无法读取文章 %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "无法发表文章。\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "无法获取文章 %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "无法选择组：%s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "无效的文章范围：%d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "没有新文章。\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "正在获取 %3$s 里的 xover %1$d - %2$d...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "无法获取 xover\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "获取 xover 时发生错误。\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "无效的 xover 行：%s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "无法获取 xhdr\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "获取 xhdr 时发生错误。\n"
 
@@ -458,27 +454,27 @@ msgstr "POP3: 正在删除过期邮件 %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3：跳过邮件 %d (%d 字节)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "信箱被锁住了\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "会话超时\n"
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "无法启动 TLS 会话\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "验证时发生错误\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "不支持的命令\n"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "POP3 会话发生错误\n"
 
@@ -511,16 +507,16 @@ msgstr "文件夹："
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content()：代码转换失败。\n"
 
-#: libsylph/procmsg.c:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "无法打开标记文件\n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "无法获取邮件 %d\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "打印命令行无效：“%s”\n"
@@ -672,7 +668,7 @@ msgstr ""
 "按照该顺序检查新邮件。选中“G”列的复选框，在“全部接收”\n"
 "时会检查新邮件。"
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -815,7 +811,7 @@ msgstr "将地址添加到地址簿"
 msgid "Address"
 msgstr "地址"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "注释"
@@ -824,29 +820,29 @@ msgstr "注释"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/文件(_F)/新建地址簿(_B)"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/文件(_F)/新建 vCard(_V)"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/文件(_F)/新建 JPilot(_J)"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -854,101 +850,101 @@ msgstr "/文件(_F)/新建服务器(_S)"
 msgid "/_File/---"
 msgstr "/文件(_F)/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/文件(_F)/编辑(_E)"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/文件(_F)/删除(_D)"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_C)"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/地址(_A)"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新建地址(_A)"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新建组(_G)"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/地址(_A)/新建文件夹(_F)"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/编辑(_E)"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/新建地址(_A)"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/新建组(_G)"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -961,82 +957,88 @@ msgstr "/新建文件夹(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/删除(_D)"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 #, fuzzy
 msgid "/_Copy"
 msgstr "/复制(_C)..."
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 #, fuzzy
 msgid "/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "电子邮件地址"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "地址簿"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "文件夹"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "电子邮件地址"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "姓名："
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "收件人："
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "抄送："
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "密件抄送："
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "删除"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "添加"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "查找"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 #, fuzzy
 msgid "_Close"
 msgstr "关闭"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "删除地址"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "真的要删除地址？"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1045,38 +1047,38 @@ msgstr ""
 "您要删除“%s”中的文件夹和所有地址吗？\n"
 "如果仅删除文件夹，地址将被移到上一级文件夹中。"
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "删除文件夹"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 #, fuzzy
 msgid "_Folder only"
 msgstr "仅文件夹"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "文件夹和地址"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "真的要删除“%s”？"
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "新建用户，无法保存索引文件。"
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "新建用户，无法保存地址簿文件。"
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr "成功转换旧的地址簿。"
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1084,7 +1086,7 @@ msgstr ""
 "已经转换旧的地址簿，\n"
 "无法保存新的地址索引文件"
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1092,7 +1094,7 @@ msgstr ""
 "无法转换地址簿，\n"
 "但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1100,95 +1102,89 @@ msgstr ""
 "无法转换地址簿，\n"
 "无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 #, fuzzy
 msgid "Address book conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 #, fuzzy
 msgid "Address Book Error"
 msgstr "地址簿错误"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "无法读取地址索引"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr "已经转换旧的地址簿，无法保存新的地址索引文件"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "无法转换地址簿，但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "无法转换地址簿，无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "界面"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "地址簿"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "个人"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "群组"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "文件夹"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "LDAP 服务器"
 
@@ -1200,15 +1196,15 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "错误"
 
@@ -1251,7 +1247,7 @@ msgstr "棕色"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "没有"
 
@@ -1594,8 +1590,8 @@ msgstr "邮件：%s"
 msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
@@ -1786,7 +1782,7 @@ msgstr "MIME 类型"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "大小"
 
@@ -2033,12 +2029,12 @@ msgstr "编辑文件夹"
 msgid "Input the new name of folder:"
 msgstr "输入文件夹的新名字："
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "新建文件夹"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "输入新建文件夹的名字："
 
@@ -2184,7 +2180,7 @@ msgstr "导出"
 msgid "Specify source folder and destination file."
 msgstr "指定目标邮箱文件和目标文件夹。"
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "日期格式"
@@ -2199,7 +2195,7 @@ msgstr "源目录："
 msgid "Destination:"
 msgstr "目标文件夹"
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2211,7 +2207,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " 选择... "
@@ -2273,23 +2269,23 @@ msgstr "废件箱"
 msgid "Drafts"
 msgstr "草稿箱"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "新文件夹"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "字符“%c”不能包含在文件夹名字中。"
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "文件夹“%s”已存在。"
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "无法创建文件夹“%s”。"
@@ -2418,32 +2414,32 @@ msgstr "正在检查所有文件夹中的新邮件..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "选中文件夹 %s\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "正在下载 %s 中的邮件..."
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "正在下载 %s 中的邮件..."
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 #, fuzzy
 msgid "Download all messages"
 msgstr "正在下载 %s 中的邮件..."
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "下载“%s”中的邮件时发生错误。"
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2453,26 +2449,26 @@ msgstr ""
 "(如果您要创建一个保存子文件夹的文件夹，\n"
 "在名字的最后添加“/”)"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "输入“%s”的新名字："
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "重命名文件件"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2481,12 +2477,12 @@ msgstr ""
 "真的要删除邮件箱“%s”？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 #, fuzzy
 msgid "Delete search folder"
 msgstr "删除文件夹"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2497,21 +2493,21 @@ msgstr ""
 "“%s”下的所有文件夹和邮件将被删除。\n"
 "您真的要删除吗？"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "清空废件箱"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2520,34 +2516,34 @@ msgstr ""
 "真的要删除邮件箱“%s”？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "删除邮箱"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "真的要删除 IMAP4 帐号“%s”？"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "删除 IMAP4 帐号"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "真的要删除新闻组“%s”？"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "删除新闻组"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "真到要删除新闻组帐号“%s”？"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "删除新闻组帐号"
 
@@ -2559,8 +2555,8 @@ msgstr "新闻组："
 msgid "Creating header view...\n"
 msgstr "正在创建标题视图...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "(没有发件人)"
 
@@ -2572,71 +2568,71 @@ msgstr "正在创建图像视图...\n"
 msgid "Can't load the image."
 msgstr "无法加载该图像。"
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "文件 %s 不存在\n"
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "指定目标邮箱文件和目标文件夹。"
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "正在扫描文件夹 %s ..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "导入"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "正在扫描文件夹 %s ..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "发表文章时发生错误\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "导入"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "指定目标邮箱文件和目标文件夹。"
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "源目录："
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "目标目录："
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "新建文件夹"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "指定目标邮箱文件和目标文件夹。"
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "选择导入文件"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "选择导入文件"
 
@@ -2797,156 +2793,156 @@ msgstr "导入 LDIF 文件到地址簿"
 msgid "Attributes"
 msgstr "属性"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "完成 (%d 个新邮件)"
 
-#: src/inc.c:477
+#: src/inc.c:478
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "正在验证"
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "正在获取新邮件"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "请等待"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "正在获取"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "完成 (收到 %d 个邮件 (%s))"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "没有新邮件"
 
-#: src/inc.c:708
+#: src/inc.c:715
 msgid "Done"
 msgstr "完成"
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "验证失败"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "锁住"
 
-#: src/inc.c:730
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "超时"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完成 (%d 个新邮件)"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "完成 (没有新邮件)"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "获取邮件时发生错误。"
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "正在获取帐号 %s 的新邮件...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "正在验证"
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s：正在获取新邮件"
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "正在连接POP3服务器：%s..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "无法连接POP3服务器：%s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "正在验证..."
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "正在从 %s 获取邮件..."
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "正在获取新邮件数量(STAT)..."
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "正在获取新邮件数量(LAST)..."
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "正在获取新邮件数量(UIDL)..."
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "正在获取新邮件的大小(LIST)..."
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "正在删除邮件 %d"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "正在退出"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "正在获取邮件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 msgid "Connection failed."
 msgstr "连接失败"
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "处理邮件时发生错误。"
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2955,29 +2951,29 @@ msgstr ""
 "处理邮件时发生错误：\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "没有剩余磁盘空间。"
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "无法写入文件。"
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "Socket错误。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "远程主机关闭了连接。"
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "信箱被锁住。"
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2986,11 +2982,11 @@ msgstr ""
 "信箱被锁住：\n"
 "%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "验证失败。"
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2999,15 +2995,15 @@ msgstr ""
 "验证失败：\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "会话超时。"
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "合并新邮件被取消\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "正在从 %s 获取新邮件到 %s...\n"
@@ -3021,24 +3017,20 @@ msgstr "输入在 %2$s 上的 %1$s 的密码："
 msgid "Input password"
 msgstr "输入密码"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "协议记录"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "glib 不支持 g_thread。\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "用法：%s [OPTION]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    打开撰写窗口"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3047,23 +3039,23 @@ msgstr ""
 "  --attach 文件1 [文件2]...\n"
 "                         打开撰写窗口并添加指定的附件"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              接收新邮件"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          接收所有帐号的新邮件"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 发送队列中的邮件"
 
-#: src/main.c:542
+#: src/main.c:554
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [文件夹]...   显示邮件总数"
 
-#: src/main.c:543
+#: src/main.c:555
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3071,49 +3063,49 @@ msgstr ""
 "  --status-full [文件夹]...\n"
 "                         显示每个文件夹的状态"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:550
+#: src/main.c:562
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                调试模式"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                调试模式"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 显示该帮助并退出"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              输出版本信息并退出"
 
-#: src/main.c:557
+#: src/main.c:569
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "或按下“y”键。\n"
 "\n"
 
-#: src/main.c:638
+#: src/main.c:694
 #, fuzzy
 msgid "Filename encoding"
 msgstr "发送时使用的字符编码"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3127,19 +3119,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "正在撰写邮件。真的要退出吗？"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "队列中的邮件"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "一些未发送的信件被放入队列。现在退出吗？"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3147,16 +3139,20 @@ msgstr ""
 "没有正确安装 GnuPG，或者版本太老。\n"
 "已禁用 OpenPGP 支持。"
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "另外一个 Sylpheed 正在运行。\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 msgid "Migration of configuration"
 msgstr "正在迁移配置"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3823,8 +3819,8 @@ msgstr "正在创建主窗口...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -4062,7 +4058,7 @@ msgstr "附件"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "无法保存文件“%s”'。"
@@ -6168,19 +6164,19 @@ msgstr "附件"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "主题"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "发件人"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "日期"
 
@@ -6190,7 +6186,7 @@ msgid "Number"
 msgstr "序号"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 #, fuzzy
 msgid "To"
 msgstr "收件人："
@@ -6492,30 +6488,30 @@ msgstr "找到 %d 封邮件。\n"
 msgid "%d messages found."
 msgstr "找到 %d 封邮件。\n"
 
-#: src/query_search.c:579
-#, fuzzy, c-format
-msgid "Searching %s ..."
-msgstr "正在扫描文件夹 %s ..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, fuzzy, c-format
+msgid "Searching %s ..."
+msgstr "正在扫描文件夹 %s ..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(没有日期)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 #, fuzzy
 msgid "Save as search folder"
 msgstr "保存到草稿文件夹"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 #, fuzzy
 msgid "Folder name:"
 msgstr "文件名"
@@ -6566,7 +6562,7 @@ msgstr "\t\t也就是“%s”\n"
 msgid "Signature made at %s\n"
 msgstr "签名创建于 %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "验证签名时发生错误"
 
@@ -6595,7 +6591,7 @@ msgstr "关于"
 msgid "%s - POP3 Remote mailbox"
 msgstr "删除邮箱"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "No."
 
@@ -6621,58 +6617,58 @@ msgid ""
 "%s"
 msgstr "POP3 会话发生错误\n"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "正在发送邮件 (%d / %d 字节)"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "正在获取新邮件数量(STAT)..."
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 #, fuzzy
 msgid "No message"
 msgstr "没有新邮件"
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "删除邮件"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "正在退出..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "正在获取新邮件"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "立即发送邮件"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "正在获取新邮件"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "正在从 %s 获取邮件..."
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 #, fuzzy
 msgid "Delete messages"
 msgstr "删除邮件"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6753,67 +6749,67 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "正在连接SMTP服务器：%s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 #, fuzzy
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "发送命令时发生错误\n"
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "正在发送 HELO..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "正在验证"
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 msgid "Sending message..."
 msgstr "正在发送邮件..."
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "正在发送 EHLO..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "正在发送 MAIL FROM..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "正在发送"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "正在发送 RCPT TO..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "正在发送 DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "正在发送邮件 (%d / %d 字节)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr ""
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "正在发送邮件"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "发送邮件时发生错误。"
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6822,12 +6818,12 @@ msgstr ""
 "发送邮件时发生错误：\n"
 "%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 #, fuzzy
 msgid "Can't connect to SMTP server."
 msgstr "无法连接SMTP服务器：%s:%d\n"
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, fuzzy, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "无法连接SMTP服务器：%s:%d\n"
@@ -6853,70 +6849,70 @@ msgstr "签名检查结果"
 msgid "Checking signature"
 msgstr "正在检查签名"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s 来自 “%s”"
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "没有找到签名"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "来自“%s”的正确签名"
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "正确的签名"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "签名有效，但是“%s”的密钥不被信任"
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "签名有效 (非信任的密钥)"
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr "签名有效，但已经过期“%s”"
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 msgid "Signature valid but expired"
 msgstr "签名有效但已经过期"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr "签名有效，但“%s”的签名密钥已经过期"
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr "签名有限但签名用的密钥已经过期"
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr "签名有效，但“%s”的签名密钥已经被废止"
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr "签名有效，但签名密钥已经被废止"
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "“%s”的签名错误"
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "签名错误"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "没有公钥来验证签名"
 
@@ -7015,7 +7011,7 @@ msgstr "无法取回新闻组列表。"
 msgid "Can't retrieve newsgroup list."
 msgstr "无法取回新闻组列表。"
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "完成。"
 
@@ -7146,220 +7142,220 @@ msgstr "有一些剩余标记。处理吗？"
 msgid "Scanning folder (%s)..."
 msgstr "正在扫描文件夹 (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 #, fuzzy
 msgid "_Search again"
 msgstr "再次查找"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "没有未读邮件"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "没发现未读邮件。从后面开始查找？"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "没有未读邮件"
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "没发现未读邮件。到下一个文件夹？"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "没有新邮件"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "没发现新邮件。从后面开始查找？"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "没有新邮件"
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "没发现新邮件。到下一个文件夹？"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "没有标记过的邮件"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "没有标记过的邮件。从后面开始查找？"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "没有标记过的邮件"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "没有标记过的邮件。从前面开始查找？"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "没有找到用颜色标注过的邮件"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "没有找到用颜色标注过的邮件。从后面开始查找？"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "没有用颜色标注的邮件。"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "没有找到用颜色标注过的邮件。从前面开始查找？"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "正在按标题归类邮件..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "删除了 %d 个邮件"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "移动了 %s%d"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr "，"
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "复制了 %s%d"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " 项被选中"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 个新邮件，%d 个未读邮件，共 %d 个邮件(%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 个新邮件邮件，%d 个未读邮件，共 %d 个邮件"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "正在排序摘要..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\t正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "正在写摘要缓存(%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "邮件 %d 被标记\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "邮件 %d 被标记为已读\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "邮件 %d 被标记为未读\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "邮件 %s/%d 设置为要删除\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "删除邮件"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您确实要删除废件箱中的邮件吗？"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "正在删除重复邮件..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "邮件 %s/%d 被取消标记\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "邮件 %d 被设置为移到 %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "目标与当前文件夹相同。"
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 #, fuzzy
 msgid "Select folder to move"
 msgstr "选择文件夹"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "邮件 %d 被设置为复制到 %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 msgid "Destination for copy is same as current folder."
 msgstr "复制目标与当前文件夹相同。"
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "选择文件夹"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 msgid "Error occurred while processing messages."
 msgstr "处理邮件时发生错误。"
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "正在创建线索..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "正在取消线索..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已经过滤 %d 个邮件。"
@@ -7456,36 +7452,42 @@ msgstr "发送队列中的邮件"
 msgid "E_xit"
 msgstr "退出"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 #, fuzzy
 msgid "Sylpheed"
 msgstr "旧式的Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "没有找到签名"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "服务器资料"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "另外一个 Sylpheed 正在运行。\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "无法打开标记文件。\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "glib 不支持 g_thread。\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "导入文件："
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7ea27e55..e1534488 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: 2009-09-03 16:39+0900\n"
+"POT-Creation-Date: 2009-10-29 11:23+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,226 +21,226 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "讀取所有帳號的設定中...\n"
 
-#: libsylph/imap.c:484
+#: libsylph/imap.c:529
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "到 %s 的 IMAP4 連線被中斷了。重新連線中...\n"
 
-#: libsylph/imap.c:539 libsylph/imap.c:545
+#: libsylph/imap.c:584 libsylph/imap.c:590
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP4 伺服器停用登入。\n"
 
-#: libsylph/imap.c:621
+#: libsylph/imap.c:666
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "正在產生 IMAP4 連線到 %s:%d ...\n"
 
-#: libsylph/imap.c:665
+#: libsylph/imap.c:710
 msgid "Can't start TLS session.\n"
 msgstr "無法開啟 TLS 連線\n"
 
-#: libsylph/imap.c:1176
-#, c-format
-msgid "Getting message %d"
+#: libsylph/imap.c:1230
+#, fuzzy, c-format
+msgid "Getting message %u"
 msgstr "擷取第 %d 號郵件"
 
-#: libsylph/imap.c:1292
+#: libsylph/imap.c:1346
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "附加郵件至 %s (%d / %d)"
 
-#: libsylph/imap.c:1384
+#: libsylph/imap.c:1469
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "正在移動郵件 %s 到 %s ..."
 
-#: libsylph/imap.c:1389
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "正在複製郵件 %s 到 %s ..."
 
-#: libsylph/imap.c:1527
+#: libsylph/imap.c:1612
 #, c-format
 msgid "Removing messages %s"
 msgstr "正在移除郵件 %s"
 
-#: libsylph/imap.c:1533
+#: libsylph/imap.c:1618
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "無法設定刪除的旗標：%s\n"
 
-#: libsylph/imap.c:1541 libsylph/imap.c:1636
+#: libsylph/imap.c:1626 libsylph/imap.c:1721
 msgid "can't expunge\n"
 msgstr "無法刪除\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1709
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "正在移除 %s 中的所有郵件"
 
-#: libsylph/imap.c:1630
+#: libsylph/imap.c:1715
 msgid "can't set deleted flags: 1:*\n"
 msgstr "無法設定刪除的旗標：1:*\n"
 
-#: libsylph/imap.c:1678
+#: libsylph/imap.c:1763
 msgid "can't close folder\n"
 msgstr "無法選擇資料夾\n"
 
-#: libsylph/imap.c:1757
+#: libsylph/imap.c:1842
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "根資料夾 %s 不存在。\n"
 
-#: libsylph/imap.c:1957 libsylph/imap.c:1965
+#: libsylph/imap.c:2042 libsylph/imap.c:2050
 msgid "error occurred while getting LIST.\n"
 msgstr "取得 LIST 時發生錯誤。\n"
 
-#: libsylph/imap.c:2196
+#: libsylph/imap.c:2281
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "無法產生 %s\n"
 
-#: libsylph/imap.c:2201
+#: libsylph/imap.c:2286
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "無法在收件夾下產生 %s\n"
 
-#: libsylph/imap.c:2263
+#: libsylph/imap.c:2348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "無法產生信箱：LIST 失敗\n"
 
-#: libsylph/imap.c:2286
+#: libsylph/imap.c:2371
 msgid "can't create mailbox\n"
 msgstr "無法產生信箱\n"
 
-#: libsylph/imap.c:2414
+#: libsylph/imap.c:2499
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "信箱 %s 無法更名為 %s\n"
 
-#: libsylph/imap.c:2494
+#: libsylph/imap.c:2579
 msgid "can't delete mailbox\n"
 msgstr "無法刪除信箱\n"
 
-#: libsylph/imap.c:2538
-msgid "can't get envelope\n"
-msgstr "無法取得信封。\n"
-
-#: libsylph/imap.c:2551
+#: libsylph/imap.c:2608
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "擷取郵件表頭 (%d / %d)"
 
-#: libsylph/imap.c:2561
+#: libsylph/imap.c:2642
+msgid "can't get envelope\n"
+msgstr "無法取得信封。\n"
+
+#: libsylph/imap.c:2671
 msgid "error occurred while getting envelope.\n"
 msgstr "取得信封時發生錯誤。\n"
 
-#: libsylph/imap.c:2583
+#: libsylph/imap.c:2692
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "無法解析信封：%s\n"
 
-#: libsylph/imap.c:2707
+#: libsylph/imap.c:2849 libsylph/imap.c:2855
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "無法連線到 IMAP4 伺服器：%s:%d\n"
 
-#: libsylph/imap.c:2714
+#: libsylph/imap.c:2863
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "無法產生 IMAP4 連線：%s:%d\n"
 
-#: libsylph/imap.c:2789
+#: libsylph/imap.c:2938
 msgid "can't get namespace\n"
 msgstr "無法取得信封。\n"
 
-#: libsylph/imap.c:3322
+#: libsylph/imap.c:3471
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "無法選擇資料夾：%s\n"
 
-#: libsylph/imap.c:3357
+#: libsylph/imap.c:3506
 msgid "error on imap command: STATUS\n"
 msgstr "發生錯誤的 imap 命令： STATUS\n"
 
-#: libsylph/imap.c:3480 libsylph/imap.c:3515
+#: libsylph/imap.c:3629 libsylph/imap.c:3664
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 認證失敗\n"
 
-#: libsylph/imap.c:3564
+#: libsylph/imap.c:3713
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 登入失敗。\n"
 
-#: libsylph/imap.c:3901
+#: libsylph/imap.c:4078
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "無法將郵件從 %s 搬移到 %s。\n"
 
-#: libsylph/imap.c:3908
+#: libsylph/imap.c:4085
 msgid "(sending file...)"
 msgstr "（送出檔案 ...）"
 
-#: libsylph/imap.c:3937
+#: libsylph/imap.c:4114
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "無法附加訊息到 %s\n"
 
-#: libsylph/imap.c:3969
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "無法將郵件 %s 移到 %s\n"
 
-#: libsylph/imap.c:3993
+#: libsylph/imap.c:4170
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap 發生錯誤，命令為： STORE %s %s\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4184
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap 發生錯誤，命令為： EXPUNGE\n"
 
-#: libsylph/imap.c:4020
+#: libsylph/imap.c:4197
 msgid "error while imap command: CLOSE\n"
 msgstr "imap 發生錯誤，命令為： CLOSE\n"
 
-#: libsylph/imap.c:4296
+#: libsylph/imap.c:4496
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "無法將 UTF-7 轉換為 %s\n"
 
-#: libsylph/imap.c:4326
+#: libsylph/imap.c:4526
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "無法轉換 %s 為 UTF-7\n"
 
-#: libsylph/mbox.c:48 libsylph/mbox.c:214
+#: libsylph/mbox.c:49 libsylph/mbox.c:216
 msgid "can't write to temporary file\n"
 msgstr "無法寫入暫存檔。\n"
 
-#: libsylph/mbox.c:80
+#: libsylph/mbox.c:81
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "從 %s 中取得郵件放入 %s...\n"
 
-#: libsylph/mbox.c:92
+#: libsylph/mbox.c:93
 msgid "can't read mbox file.\n"
 msgstr "無法讀取 mbox 檔案。\n"
 
-#: libsylph/mbox.c:99
+#: libsylph/mbox.c:100
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "不合法的 mbox 格式：%s\n"
 
-#: libsylph/mbox.c:106
+#: libsylph/mbox.c:107
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "損壞的 mbox: %s\n"
 
-#: libsylph/mbox.c:128
+#: libsylph/mbox.c:130
 msgid "can't open temporary file\n"
 msgstr "無法開啟暫存檔。\n"
 
-#: libsylph/mbox.c:179
+#: libsylph/mbox.c:181
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -249,66 +249,62 @@ msgstr ""
 "不完整的 From 格式：\n"
 "%s"
 
-#: libsylph/mbox.c:306
+#: libsylph/mbox.c:323
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "無法開啟檔案 %s\n"
 
-#: libsylph/mbox.c:307
+#: libsylph/mbox.c:324
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "如果可以，請使用「flock」替代「file」。\n"
 
-#: libsylph/mbox.c:319
+#: libsylph/mbox.c:336
 #, c-format
 msgid "can't create %s\n"
 msgstr "無法產生 %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:342
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "信箱正被其他的行程讀取中, 請稍候...\n"
 
-#: libsylph/mbox.c:354
+#: libsylph/mbox.c:371
 #, c-format
 msgid "can't lock %s\n"
 msgstr "無法鎖住 %s\n"
 
-#: libsylph/mbox.c:361 libsylph/mbox.c:411
+#: libsylph/mbox.c:378 libsylph/mbox.c:428
 msgid "invalid lock type\n"
 msgstr "不合法的 lock 型態。\n"
 
-#: libsylph/mbox.c:397
+#: libsylph/mbox.c:414
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "%s 無法打開 \n"
 
-#: libsylph/mbox.c:432
+#: libsylph/mbox.c:449
 msgid "can't truncate mailbox to zero.\n"
 msgstr "無法清除信箱。\n"
 
-#: libsylph/mbox.c:457
+#: libsylph/mbox.c:474
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "將郵件由 %s 匯出到 %s 中...\n"
 
-#: libsylph/mh.c:465
+#: libsylph/mh.c:509
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "無法將郵件從 %s 搬移到 %s。\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:667
-msgid "Can't open mark file.\n"
-msgstr "無法開啟標記的檔案。\n"
-
-#: libsylph/mh.c:547 libsylph/mh.c:673
+#: libsylph/mh.c:703 libsylph/mh.c:821
 msgid "the src folder is identical to the dest.\n"
 msgstr "來源與目的資料夾相同。\n"
 
-#: libsylph/mh.c:676
+#: libsylph/mh.c:824
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "正在複製訊息 %s%c%d 到 %s ...\n"
 
-#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
+#: libsylph/mh.c:1188 libsylph/mh.c:1201 src/main.c:180
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -317,7 +313,7 @@ msgstr ""
 "檔案「%s」已存在。\n"
 "無法產生資料夾。"
 
-#: libsylph/mh.c:1569
+#: libsylph/mh.c:1763
 #, c-format
 msgid ""
 "Directory name\n"
@@ -335,77 +331,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:214
+#: libsylph/news.c:216
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "產生新聞通訊協定連線到 %s:%d , 請稍候...\n"
 
-#: libsylph/news.c:283
+#: libsylph/news.c:285
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "到 %s:%d 的新聞通訊協定連線被中斷了。重新連線中...\n"
 
-#: libsylph/news.c:384
+#: libsylph/news.c:388
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "文章 %d 已經被暫存於快取之中。\n"
 
-#: libsylph/news.c:404
+#: libsylph/news.c:408
 #, c-format
 msgid "getting article %d...\n"
 msgstr "正在擷取文章 %d...\n"
 
-#: libsylph/news.c:408
+#: libsylph/news.c:412
 #, c-format
 msgid "can't read article %d\n"
 msgstr "無法讀取文章 %d\n"
 
-#: libsylph/news.c:683
+#: libsylph/news.c:687
 msgid "can't post article.\n"
 msgstr "無法發表文章。\n"
 
-#: libsylph/news.c:709
+#: libsylph/news.c:713
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "無法取得文章 %d\n"
 
-#: libsylph/news.c:766
+#: libsylph/news.c:770
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "無法選擇新聞群組：%s\n"
 
-#: libsylph/news.c:803
+#: libsylph/news.c:807
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "錯誤的文章範圍：%d - %d\n"
 
-#: libsylph/news.c:816
+#: libsylph/news.c:820
 msgid "no new articles.\n"
 msgstr "沒有新文章。\n"
 
-#: libsylph/news.c:826
+#: libsylph/news.c:830
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "正在擷取 xover %d - %d 於 %s...\n"
 
-#: libsylph/news.c:830
+#: libsylph/news.c:834
 msgid "can't get xover\n"
 msgstr "無法取得 xover\n"
 
-#: libsylph/news.c:840
+#: libsylph/news.c:844
 msgid "error occurred while getting xover.\n"
 msgstr "取得 xover 時發生錯誤。\n"
 
-#: libsylph/news.c:850
+#: libsylph/news.c:854
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "xover 內容錯誤：%s\n"
 
-#: libsylph/news.c:869 libsylph/news.c:901
+#: libsylph/news.c:873 libsylph/news.c:905
 msgid "can't get xhdr\n"
 msgstr "無法取得 xhdr\n"
 
-#: libsylph/news.c:881 libsylph/news.c:913
+#: libsylph/news.c:885 libsylph/news.c:917
 msgid "error occurred while getting xhdr.\n"
 msgstr "取得 xhdr 時發生錯誤。\n"
 
@@ -463,27 +459,27 @@ msgstr "POP3: 刪除過期的郵件 %d\n"
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: 略過郵件 %d (%d 位元組)\n"
 
-#: libsylph/pop.c:689
+#: libsylph/pop.c:690
 msgid "mailbox is locked\n"
 msgstr "信箱已被鎖定，可能前一次擷取未完成。\n"
 
-#: libsylph/pop.c:692
+#: libsylph/pop.c:693
 msgid "session timeout\n"
 msgstr "作業逾時\n"
 
-#: libsylph/pop.c:698 libsylph/smtp.c:561
+#: libsylph/pop.c:699 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "無法啟動 TLS 工作階段\n"
 
-#: libsylph/pop.c:705 libsylph/smtp.c:496
+#: libsylph/pop.c:706 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "認證時發生錯誤\n"
 
-#: libsylph/pop.c:710
+#: libsylph/pop.c:711
 msgid "command not supported\n"
 msgstr "命令未支援\n"
 
-#: libsylph/pop.c:714
+#: libsylph/pop.c:715
 msgid "error occurred on POP3 session\n"
 msgstr "使用 POP3 通訊協定時發生錯誤\n"
 
@@ -515,16 +511,16 @@ msgstr "垃圾郵件資料夾"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): 轉碼失敗。\n"
 
-#: libsylph/procmsg.c:656
+#: libsylph/procmsg.c:849
 msgid "can't open mark file\n"
 msgstr "無法開啟標示的檔案 \n"
 
-#: libsylph/procmsg.c:1139
+#: libsylph/procmsg.c:1333
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "無法擷取郵件 %d\n"
 
-#: libsylph/procmsg.c:1377
+#: libsylph/procmsg.c:1572
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "列印命令錯誤：「%s」\n"
@@ -677,7 +673,7 @@ msgstr ""
 "檢查新郵件時將會依照下面的順序。您可以勾選 G 欄位中的方塊，\n"
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:502
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:684
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -818,7 +814,7 @@ msgstr "將地址加入通訊錄"
 msgid "Address"
 msgstr "地址"
 
-#: src/addressadd.c:197 src/addressbook.c:504 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "備註"
@@ -827,29 +823,29 @@ msgstr "備註"
 msgid "Select Address Book Folder"
 msgstr "選擇通訊錄資料夾"
 
-#: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/檔案(_F)"
 
-#: src/addressbook.c:335
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/檔案(_F)/新增通訊錄(_B)"
 
-#: src/addressbook.c:336
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/檔案(_F)/新增vCard(_V)"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/檔案(_F)/新增J-Pilot(_J)"
 
-#: src/addressbook.c:341
+#: src/addressbook.c:358
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/檔案(_F)/新增伺服器(_S)"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:565
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -857,101 +853,101 @@ msgstr "/檔案(_F)/新增伺服器(_S)"
 msgid "/_File/---"
 msgstr "/檔案(_F)/---"
 
-#: src/addressbook.c:344
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/檔案(_F)/編輯(_E)"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/檔案(_F)/刪除(_D)"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/檔案(_F)/儲存(_S)"
 
-#: src/addressbook.c:348 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/檔案(_F)/關閉(_C)"
 
-#: src/addressbook.c:350 src/addressbook.c:390 src/addressbook.c:400
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/編輯(_E)"
 
-#: src/addressbook.c:351 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/編輯(_E)/複製(_C)"
 
-#: src/addressbook.c:352 src/compose.c:585
+#: src/addressbook.c:369 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/編輯(_E)/貼上(_P)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/地址(_A)"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新增地址(_A)"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新增群組(_G)"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/地址(_A)/新增資料夾(_F)"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/編輯(_E)"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/刪除(_D)"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:381
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: src/addressbook.c:367 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/說明(_H)/關於(_A)"
 
-#: src/addressbook.c:386 src/addressbook.c:396
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/新增地址(_A)"
 
-#: src/addressbook.c:387 src/addressbook.c:397
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/新增群組(_G)"
 
-#: src/addressbook.c:388 src/addressbook.c:398
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/新增資料夾(_F)"
 
-#: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -964,82 +960,88 @@ msgstr "/新增資料夾(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:391 src/addressbook.c:401 src/summaryview.c:441
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/刪除(_D)"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:420
 #, fuzzy
 msgid "/_Copy"
 msgstr "/複製(_C)..."
 
-#: src/addressbook.c:404
+#: src/addressbook.c:421
 #, fuzzy
 msgid "/_Paste"
 msgstr "/編輯(_E)/貼上(_P)"
 
-#: src/addressbook.c:503
-msgid "E-Mail address"
-msgstr "E-Mail 地址"
-
-#: src/addressbook.c:507 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "通訊錄"
 
-#: src/addressbook.c:619 src/prefs_filter_edit.c:251
+#. special folder setting (maybe these options are redundant)
+#: src/addressbook.c:618 src/addressbook.c:3643 src/folderview.c:385
+#: src/prefs_account_dialog.c:1835 src/query_search.c:400
+msgid "Folder"
+msgstr "資料夾"
+
+#: src/addressbook.c:707
+msgid "E-Mail address"
+msgstr "E-Mail 地址"
+
+#: src/addressbook.c:739 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "姓名："
 
-#: src/addressbook.c:656 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "收件人"
 
-#: src/addressbook.c:660 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "副本"
 
-#: src/addressbook.c:664 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "密件副本"
 
 #. Buttons
-#: src/addressbook.c:685 src/addressbook.c:1649 src/editaddress.c:719
+#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "刪除"
 
-#: src/addressbook.c:688 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "新增"
 
-#: src/addressbook.c:691
+#: src/addressbook.c:811
 msgid "Lookup"
 msgstr "尋找"
 
-#: src/addressbook.c:694
+#: src/addressbook.c:814
 #, fuzzy
 msgid "_Close"
 msgstr "顏色"
 
 #. Confirm deletion
-#: src/addressbook.c:864
+#: src/addressbook.c:1015
 msgid "Delete address(es)"
 msgstr "刪除通訊紀錄"
 
-#: src/addressbook.c:865
+#: src/addressbook.c:1016
 msgid "Really delete the address(es)?"
 msgstr "您確定要刪除這些紀錄嗎？"
 
-#: src/addressbook.c:1640
+#: src/addressbook.c:1865
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1048,38 +1050,38 @@ msgstr ""
 "您確定要刪除「%s」資料夾以及裡面所有的地址嗎？\n"
 "如果您選擇只刪除資料夾，裡面的通訊紀錄將移到上一層資料夾中。"
 
-#: src/addressbook.c:1643 src/folderview.c:2542
+#: src/addressbook.c:1868 src/folderview.c:2544
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "_Folder only"
 msgstr "只刪除資料夾(_F)"
 
-#: src/addressbook.c:1643
+#: src/addressbook.c:1868
 msgid "Folder and _addresses"
 msgstr "全部刪除(_A)"
 
-#: src/addressbook.c:1648
+#: src/addressbook.c:1873
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "您確定要刪除「%s」? "
 
-#: src/addressbook.c:2425 src/addressbook.c:2558
+#: src/addressbook.c:2741 src/addressbook.c:2875
 msgid "New user, could not save index file."
 msgstr "無法儲存索引檔案。"
 
-#: src/addressbook.c:2429 src/addressbook.c:2562
+#: src/addressbook.c:2745 src/addressbook.c:2879
 msgid "New user, could not save address book files."
 msgstr "無法儲存通訊錄檔案。"
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2755 src/addressbook.c:2889
 msgid "Old address book converted successfully."
 msgstr ""
 "轉換舊通訊錄格式完成。\n"
 "您可以開始使用新的通訊錄。"
 
-#: src/addressbook.c:2444
+#: src/addressbook.c:2760
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1087,7 +1089,7 @@ msgstr ""
 "舊通訊錄格式已轉換，\n"
 "但無法儲存新的索引檔。"
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2773
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1095,7 +1097,7 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "但已產生空的新通訊錄。"
 
-#: src/addressbook.c:2463
+#: src/addressbook.c:2779
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1103,7 +1105,7 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2468
+#: src/addressbook.c:2784
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1111,89 +1113,83 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2475
+#: src/addressbook.c:2791
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "轉換通訊錄格式時發生錯誤"
 
-#: src/addressbook.c:2479
+#: src/addressbook.c:2795
 #, fuzzy
 msgid "Address book conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:2514
+#: src/addressbook.c:2831
 #, fuzzy
 msgid "Address Book Error"
 msgstr "通訊錄發生錯誤"
 
-#: src/addressbook.c:2515 src/addressbook.c:2615
+#: src/addressbook.c:2832 src/addressbook.c:2932
 msgid "Could not read address index"
 msgstr "無法讀取通訊錄索引"
 
-#: src/addressbook.c:2577
+#: src/addressbook.c:2894
 msgid "Old address book converted, could not save new address index file"
 msgstr "舊通訊錄格式已轉換，但無法儲存新的索引檔。"
 
-#: src/addressbook.c:2591
+#: src/addressbook.c:2908
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "無法轉換通訊錄格式，但已產生空的新通訊錄。"
 
-#: src/addressbook.c:2597
+#: src/addressbook.c:2914
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "無法轉換通訊錄格式，亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2603
+#: src/addressbook.c:2920
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "無法轉換通訊錄格式，亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2621
+#: src/addressbook.c:2938
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "轉換通訊錄格式時發生錯誤"
 
-#: src/addressbook.c:2627
+#: src/addressbook.c:2944
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:3147 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3573 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "介面"
 
-#: src/addressbook.c:3163 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3587 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "通訊錄"
 
-#: src/addressbook.c:3179
+#: src/addressbook.c:3601
 msgid "Person"
 msgstr "人名"
 
-#: src/addressbook.c:3195
+#: src/addressbook.c:3615
 msgid "EMail Address"
 msgstr "電子郵件信箱"
 
-#: src/addressbook.c:3211
+#: src/addressbook.c:3629
 msgid "Group"
 msgstr "群組"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3227 src/folderview.c:385 src/prefs_account_dialog.c:1835
-#: src/query_search.c:400
-msgid "Folder"
-msgstr "資料夾"
-
-#: src/addressbook.c:3243
+#: src/addressbook.c:3657
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3259 src/addressbook.c:3275
+#: src/addressbook.c:3671 src/addressbook.c:3685
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3291
+#: src/addressbook.c:3699
 msgid "LDAP Server"
 msgstr "LDAP 伺服器"
 
@@ -1205,15 +1201,15 @@ msgstr "共用通訊紀錄"
 msgid "Personal address"
 msgstr "私人通訊紀錄"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:677
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:733
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:155 src/main.c:786
+#: src/alertpanel.c:155 src/main.c:842
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:168 src/inc.c:727
+#: src/alertpanel.c:168 src/inc.c:734
 msgid "Error"
 msgstr "錯誤"
 
@@ -1256,7 +1252,7 @@ msgstr "棕色"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4970
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4974
 msgid "None"
 msgstr "無"
 
@@ -1596,8 +1592,8 @@ msgstr "郵件：%s"
 msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:663 src/summaryview.c:2299
+#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:786
+#: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "（沒有主旨）"
 
@@ -1788,7 +1784,7 @@ msgstr "MIME 型態"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5119
+#: src/summaryview.c:5123
 msgid "Size"
 msgstr "大小"
 
@@ -2031,12 +2027,12 @@ msgstr "編輯資料夾"
 msgid "Input the new name of folder:"
 msgstr "請輸入新的資料夾名稱："
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2274
-#: src/folderview.c:2280
+#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2276
+#: src/folderview.c:2282
 msgid "New folder"
 msgstr "新資料夾"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2281
+#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2283
 msgid "Input the name of new folder:"
 msgstr "請輸入新資料夾的名稱："
 
@@ -2182,7 +2178,7 @@ msgstr "匯出郵件"
 msgid "Specify source folder and destination file."
 msgstr "請指定目標信箱與資料夾。"
 
-#: src/export.c:341 src/import.c:323
+#: src/export.c:341 src/import.c:335
 #, fuzzy
 msgid "File format:"
 msgstr "日期格式"
@@ -2197,7 +2193,7 @@ msgstr "來源資料夾："
 msgid "Destination:"
 msgstr "目標目錄："
 
-#: src/export.c:361 src/import.c:343
+#: src/export.c:361 src/import.c:355
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2209,7 +2205,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:360 src/import.c:366
+#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "選擇..."
@@ -2270,23 +2266,23 @@ msgstr "刪除的郵件"
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/foldersel.c:587 src/folderview.c:2278 src/folderview.c:2282
+#: src/foldersel.c:587 src/folderview.c:2280 src/folderview.c:2284
 msgid "NewFolder"
 msgstr "新資料夾"
 
-#: src/foldersel.c:595 src/folderview.c:2292 src/folderview.c:2300
-#: src/folderview.c:2362
+#: src/foldersel.c:595 src/folderview.c:2294 src/folderview.c:2302
+#: src/folderview.c:2364
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "資料夾名稱中不應含有「%c」這個字元。"
 
-#: src/foldersel.c:605 src/folderview.c:2311 src/folderview.c:2370
-#: src/query_search.c:1052
+#: src/foldersel.c:605 src/folderview.c:2313 src/folderview.c:2372
+#: src/query_search.c:1151
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "資料夾「%s」已存在。"
 
-#: src/foldersel.c:613 src/folderview.c:2318
+#: src/foldersel.c:613 src/folderview.c:2320
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "無法建立資料夾「%s」。"
@@ -2414,32 +2410,32 @@ msgstr "檢查每個資料夾中的新郵件..."
 msgid "Junk"
 msgstr "垃圾郵件"
 
-#: src/folderview.c:1935
+#: src/folderview.c:1937
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "已選取 %s 資料夾\n"
 
-#: src/folderview.c:2090
+#: src/folderview.c:2092
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "從 %s 下載郵件中..."
 
-#: src/folderview.c:2118
+#: src/folderview.c:2120
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "從 %s 下載郵件中..."
 
-#: src/folderview.c:2121
+#: src/folderview.c:2123
 #, fuzzy
 msgid "Download all messages"
 msgstr "從 %s 下載郵件中..."
 
-#: src/folderview.c:2170
+#: src/folderview.c:2172
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "從 %s 下載郵件時出現錯誤。"
 
-#: src/folderview.c:2275
+#: src/folderview.c:2277
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2449,26 +2445,26 @@ msgstr ""
 "（若是資料夾下要有子資料夾，\n"
 "　請在資料夾名稱的後面加上「/'）"
 
-#: src/folderview.c:2350
+#: src/folderview.c:2352
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "請輸入「%s」的新名稱："
 
-#: src/folderview.c:2351
+#: src/folderview.c:2353
 msgid "Rename folder"
 msgstr "重新命名資料夾"
 
-#: src/folderview.c:2382 src/folderview.c:2390
+#: src/folderview.c:2384 src/folderview.c:2392
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "無法移除資料夾「%s」。"
 
-#: src/folderview.c:2463
+#: src/folderview.c:2465
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "無法移動資料夾「%s」。"
 
-#: src/folderview.c:2532
+#: src/folderview.c:2534
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2477,12 +2473,12 @@ msgstr ""
 "確定要移除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2534
+#: src/folderview.c:2536
 #, fuzzy
 msgid "Delete search folder"
 msgstr "刪除資料夾"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2541
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2495,20 +2491,20 @@ msgstr ""
 "\n"
 "您確定要刪除它嗎？"
 
-#: src/folderview.c:2571 src/folderview.c:2577
+#: src/folderview.c:2573 src/folderview.c:2579
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "無法移除資料夾「%s」。"
 
-#: src/folderview.c:2613
+#: src/folderview.c:2615
 msgid "Empty trash"
 msgstr "清空刪除的郵件"
 
-#: src/folderview.c:2614
+#: src/folderview.c:2616
 msgid "Delete all messages in the trash folder?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/folderview.c:2655
+#: src/folderview.c:2657
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2517,34 +2513,34 @@ msgstr ""
 "確定要移除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2657
+#: src/folderview.c:2659
 msgid "Remove mailbox"
 msgstr "移除信箱"
 
-#: src/folderview.c:2707
+#: src/folderview.c:2709
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "您確定要刪除 %s 這個 IMAP4 帳號？"
 
-#: src/folderview.c:2708
+#: src/folderview.c:2710
 msgid "Delete IMAP4 account"
 msgstr "刪除 IMAP4 帳號"
 
-#: src/folderview.c:2861
+#: src/folderview.c:2863
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "您確定要刪除新聞群組「%s」嗎？"
 
-#: src/folderview.c:2862
+#: src/folderview.c:2864
 msgid "Delete newsgroup"
 msgstr "刪除新聞群組"
 
-#: src/folderview.c:2912
+#: src/folderview.c:2914
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "您確定要刪除新聞群組帳號「%s」嗎？"
 
-#: src/folderview.c:2913
+#: src/folderview.c:2915
 msgid "Delete news account"
 msgstr "刪除帳號"
 
@@ -2556,8 +2552,8 @@ msgstr "新聞群組："
 msgid "Creating header view...\n"
 msgstr "產生標頭視窗...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
-#: src/summaryview.c:2302
+#: src/headerview.c:212 src/query_search.c:787 src/rpop3.c:668
+#: src/summaryview.c:2304
 msgid "(No From)"
 msgstr "（沒有來源）"
 
@@ -2569,71 +2565,71 @@ msgstr "產生圖片的視窗...\n"
 msgid "Can't load the image."
 msgstr "無法載入圖片。"
 
-#: src/import.c:185
+#: src/import.c:187
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "檔案 %s 不存在\n"
 
-#: src/import.c:196
+#: src/import.c:198
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "請指定目標信箱與資料夾。"
 
-#: src/import.c:201
+#: src/import.c:203
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "掃描資料夾 %s ..."
 
-#: src/import.c:203
+#: src/import.c:205
 #, fuzzy
 msgid "Importing"
 msgstr "匯入"
 
-#: src/import.c:222
+#: src/import.c:224
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "掃描資料夾 %s ..."
 
-#: src/import.c:233
+#: src/import.c:235
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "發表文章時發生錯誤\n"
 
-#: src/import.c:294
+#: src/import.c:306
 msgid "Import"
 msgstr "匯入"
 
-#: src/import.c:313 src/import.c:398
+#: src/import.c:325 src/import.c:410
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "請指定目標信箱與資料夾。"
 
-#: src/import.c:328
+#: src/import.c:340
 #, fuzzy
 msgid "Source:"
 msgstr "來源資料夾："
 
-#: src/import.c:333
+#: src/import.c:345
 #, fuzzy
 msgid "Destination folder:"
 msgstr "目標目錄："
 
-#: src/import.c:346
+#: src/import.c:358
 #, fuzzy
 msgid "eml (folder)"
 msgstr "新資料夾"
 
-#: src/import.c:395
+#: src/import.c:407
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "請指定目標信箱與資料夾。"
 
-#: src/import.c:425
+#: src/import.c:437
 #, fuzzy
 msgid "Select importing folder"
 msgstr "選擇匯入檔案"
 
-#: src/import.c:428
+#: src/import.c:440
 msgid "Select importing file"
 msgstr "選擇匯入檔案"
 
@@ -2794,157 +2790,157 @@ msgstr "將 LDIF 檔匯入通訊錄"
 msgid "Attributes"
 msgstr "屬性"
 
-#: src/inc.c:159
+#: src/inc.c:160
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d 封新郵件"
 
-#: src/inc.c:477
+#: src/inc.c:478
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "認證中..."
 
-#: src/inc.c:503
+#: src/inc.c:504
 msgid "Retrieving new messages"
 msgstr "取得新郵件中"
 
-#: src/inc.c:546
+#: src/inc.c:547
 msgid "Standby"
 msgstr "等待處理中"
 
-#: src/inc.c:683 src/inc.c:733
+#: src/inc.c:690 src/inc.c:740
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/inc.c:694
+#: src/inc.c:701
 msgid "Retrieving"
 msgstr "讀取中"
 
-#: src/inc.c:703 src/inc.c:1013
+#: src/inc.c:710 src/inc.c:1019
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "完成 （已接收 %d 封郵件 (%s)）"
 
-#: src/inc.c:707
+#: src/inc.c:714
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "沒有新郵件。"
 
-#: src/inc.c:708
+#: src/inc.c:715
 #, fuzzy
 msgid "Done"
 msgstr "完成"
 
-#: src/inc.c:713
+#: src/inc.c:720
 msgid "Connection failed"
 msgstr "連線失敗。"
 
-#: src/inc.c:716
+#: src/inc.c:723
 msgid "Auth failed"
 msgstr "認證失敗"
 
-#: src/inc.c:720
+#: src/inc.c:727
 msgid "Locked"
 msgstr "已鎖定"
 
-#: src/inc.c:730
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "逾時"
 
-#: src/inc.c:780
+#: src/inc.c:784
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完成（%d 封新郵件）"
 
-#: src/inc.c:783
+#: src/inc.c:787
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "完成（無新郵件）"
 
-#: src/inc.c:792
+#: src/inc.c:796
 msgid "Some errors occurred while getting mail."
 msgstr "取得郵件時發生錯誤。"
 
-#: src/inc.c:826
+#: src/inc.c:830
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "取得 %s 的新郵件中, 請稍候...\n"
 
-#: src/inc.c:830
+#: src/inc.c:834
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "認證中..."
 
-#: src/inc.c:833
+#: src/inc.c:837
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 取得新郵件中, 請稍候..."
 
-#: src/inc.c:838
+#: src/inc.c:842
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "連線到 POP3 伺服器 %s 中..."
 
-#: src/inc.c:852
+#: src/inc.c:856
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "無法連線到 POP3 伺服器：%s:%d\n"
 
-#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:938 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "認證"
 
-#: src/inc.c:933
+#: src/inc.c:939
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "從 %s 中取得郵件中..."
 
-#: src/inc.c:938
+#: src/inc.c:944
 msgid "Getting the number of new messages (STAT)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:942
+#: src/inc.c:948
 msgid "Getting the number of new messages (LAST)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:946
+#: src/inc.c:952
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:950
+#: src/inc.c:956
 msgid "Getting the size of messages (LIST)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:960
+#: src/inc.c:966
 #, c-format
 msgid "Deleting message %d"
 msgstr "刪除第 %d 號郵件"
 
-#: src/inc.c:967 src/send_message.c:831
+#: src/inc.c:973 src/send_message.c:835
 msgid "Quitting"
 msgstr "離開"
 
-#: src/inc.c:992
+#: src/inc.c:998
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "取得新郵件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4531
+#: src/inc.c:1235 src/inc.c:1258 src/summaryview.c:4535
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1274
+#: src/inc.c:1318
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: src/inc.c:1280
+#: src/inc.c:1324
 msgid "Error occurred while processing mail."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/inc.c:1285
+#: src/inc.c:1329
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2953,40 +2949,40 @@ msgstr ""
 "處理郵件時發生錯誤：\n"
 "%s"
 
-#: src/inc.c:1291
+#: src/inc.c:1335
 msgid "No disk space left."
 msgstr "磁碟空間已滿。"
 
-#: src/inc.c:1296
+#: src/inc.c:1340
 msgid "Can't write file."
 msgstr "無法寫入檔案。"
 
-#: src/inc.c:1301
+#: src/inc.c:1345
 msgid "Socket error."
 msgstr "Socket 有錯誤"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
-#: src/send_message.c:966
+#: src/inc.c:1351 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "遠端主機關閉連線。"
 
-#: src/inc.c:1313
+#: src/inc.c:1357
 msgid "Mailbox is locked."
 msgstr "信箱已被鎖定，可能前一次擷取未完成。"
 
-#: src/inc.c:1317
+#: src/inc.c:1361
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "信箱已被鎖定：%s"
 
-#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1367 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "認證失敗"
 
-#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1372 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2995,15 +2991,15 @@ msgstr ""
 "認證失敗：\n"
 "%s"
 
-#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1377 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "作業逾時"
 
-#: src/inc.c:1374
+#: src/inc.c:1418
 msgid "Incorporation cancelled\n"
 msgstr "動作已取消\n"
 
-#: src/inc.c:1476
+#: src/inc.c:1520
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "從 %s 中取得郵件放入 %s...\n"
@@ -3017,24 +3013,20 @@ msgstr "請輸入 %s 在 %s 上的密碼："
 msgid "Input password"
 msgstr "輸入密碼"
 
-#: src/logwindow.c:68
+#: src/logwindow.c:72
 msgid "Protocol log"
 msgstr "通訊協定紀錄"
 
-#: src/main.c:224
-msgid "g_thread is not supported by glib.\n"
-msgstr "glib 不支援 g_thread。\n"
-
-#: src/main.c:532
+#: src/main.c:544
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "用法：%s [選項]...\n"
 
-#: src/main.c:535
+#: src/main.c:547
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [郵件地址]   直接開啟撰寫郵件視窗"
 
-#: src/main.c:536
+#: src/main.c:548
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3043,68 +3035,68 @@ msgstr ""
 "  --attach 檔案1 [檔案2]...\n"
 "                         開啟撰寫郵件視窗，並將指定的檔案附加上去"
 
-#: src/main.c:539
+#: src/main.c:551
 msgid "  --receive              receive new messages"
 msgstr "  --receive              直接接收新郵件"
 
-#: src/main.c:540
+#: src/main.c:552
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          直接接收所有帳號的新郵件"
 
-#: src/main.c:541
+#: src/main.c:553
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 送出所有暫存資料夾中的郵件"
 
-#: src/main.c:542
+#: src/main.c:554
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [資料夾]...   顯示資料夾內總共有多少郵件"
 
-#: src/main.c:543
+#: src/main.c:555
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status-full [資料夾]...     顯示每個資料夾中有多少郵件"
 
-#: src/main.c:545
+#: src/main.c:557
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:546
+#: src/main.c:558
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:548
+#: src/main.c:560
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:550
+#: src/main.c:562
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                除錯模式"
 
-#: src/main.c:551
+#: src/main.c:563
 msgid "  --debug                debug mode"
 msgstr "  --debug                除錯模式"
 
-#: src/main.c:552
+#: src/main.c:564
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 顯示本說明並離開"
 
-#: src/main.c:553
+#: src/main.c:565
 msgid "  --version              output version information and exit"
 msgstr "  --version              顯示版本資訊"
 
-#: src/main.c:557
+#: src/main.c:569
 #, c-format
 msgid "Press any key..."
 msgstr ""
 
-#: src/main.c:638
+#: src/main.c:694
 msgid "Filename encoding"
 msgstr "檔案名稱編碼"
 
-#: src/main.c:639
+#: src/main.c:695
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3125,19 +3117,19 @@ msgstr ""
 "\n"
 "要繼續嗎？"
 
-#: src/main.c:678
+#: src/main.c:734
 msgid "Composing message exists. Really quit?"
 msgstr "有郵件正在編輯。確定要離開嗎？"
 
-#: src/main.c:689
+#: src/main.c:745
 msgid "Queued messages"
 msgstr "有未送出郵件"
 
-#: src/main.c:690
+#: src/main.c:746
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "有些郵件正在暫存資料夾中尚未送出。確定要離開嗎？"
 
-#: src/main.c:787
+#: src/main.c:843
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3145,16 +3137,20 @@ msgstr ""
 "GnuPG 並未安裝好，或版本過舊。\n"
 "關閉 OpenPGP 支援項目。"
 
+#: src/main.c:1073
+msgid "Loading plug-ins..."
+msgstr ""
+
 #. remote command mode
-#: src/main.c:1130
+#: src/main.c:1194
 msgid "another Sylpheed is already running.\n"
 msgstr "已經有 Sylpheed 程式正在執行中。\n"
 
-#: src/main.c:1400
+#: src/main.c:1464
 msgid "Migration of configuration"
 msgstr "設定資料轉移"
 
-#: src/main.c:1401
+#: src/main.c:1465
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3814,8 +3810,8 @@ msgstr "建立主視窗...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主視窗：顏色 %d 配置失敗。\n"
 
-#: src/mainwindow.c:1201 src/summaryview.c:2451 src/summaryview.c:2536
-#: src/summaryview.c:4096 src/summaryview.c:4225 src/summaryview.c:4602
+#: src/mainwindow.c:1201 src/summaryview.c:2453 src/summaryview.c:2540
+#: src/summaryview.c:4100 src/summaryview.c:4229 src/summaryview.c:4606
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -4052,7 +4048,7 @@ msgstr "附加檔"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3654
+#: src/messageview.c:765 src/summaryview.c:3658
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "無法儲存檔案「%s」。"
@@ -6132,19 +6128,19 @@ msgstr "附加檔案"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5112
+#: src/summaryview.c:5116
 msgid "Subject"
 msgstr "主旨"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5115
+#: src/summaryview.c:5119
 msgid "From"
 msgstr "來源"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5117
+#: src/summaryview.c:5121
 msgid "Date"
 msgstr "日期"
 
@@ -6154,7 +6150,7 @@ msgid "Number"
 msgstr "編號"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5123
+#: src/prefs_summary_column.c:74 src/summaryview.c:5127
 #, fuzzy
 msgid "To"
 msgstr "收件人"
@@ -6456,30 +6452,30 @@ msgstr "共有 %d 封郵件。\n"
 msgid "%d messages found."
 msgstr "共有 %d 封郵件。\n"
 
-#: src/query_search.c:579
-#, fuzzy, c-format
-msgid "Searching %s ..."
-msgstr "掃描資料夾 %s ..."
-
-#: src/query_search.c:612
+#: src/query_search.c:585
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "過濾中..."
 
-#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2223
+#: src/query_search.c:709
+#, fuzzy, c-format
+msgid "Searching %s ..."
+msgstr "掃描資料夾 %s ..."
+
+#: src/query_search.c:795 src/rpop3.c:676 src/summaryview.c:2225
 msgid "(No Date)"
 msgstr "(沒有日期)"
 
-#: src/query_search.c:890
+#: src/query_search.c:989
 #, fuzzy
 msgid "Save as search folder"
 msgstr "儲存至草稿資料夾"
 
-#: src/query_search.c:911
+#: src/query_search.c:1010
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:926
+#: src/query_search.c:1025
 #, fuzzy
 msgid "Folder name:"
 msgstr "檔名"
@@ -6530,7 +6526,7 @@ msgstr "\t\t亦即 \"%s\"\n"
 msgid "Signature made at %s\n"
 msgstr "產生簽章於 %s\n"
 
-#: src/rfc2015.c:308 src/sigstatus.c:269
+#: src/rfc2015.c:308 src/sigstatus.c:273
 msgid "Error verifying the signature"
 msgstr "檢查簽章時發生錯誤"
 
@@ -6559,7 +6555,7 @@ msgstr "關於"
 msgid "%s - POP3 Remote mailbox"
 msgstr "移除信箱"
 
-#: src/rpop3.c:414 src/summaryview.c:5121
+#: src/rpop3.c:414 src/summaryview.c:5125
 msgid "No."
 msgstr "No."
 
@@ -6585,58 +6581,58 @@ msgid ""
 "%s"
 msgstr "使用 POP3 通訊協定時發生錯誤\n"
 
-#: src/rpop3.c:686
+#: src/rpop3.c:690
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "擷取郵件表頭 (%d / %d)"
 
-#: src/rpop3.c:846
+#: src/rpop3.c:853
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "取得新郵件的數量中"
 
-#: src/rpop3.c:855 src/rpop3.c:868
+#: src/rpop3.c:862 src/rpop3.c:875
 #, fuzzy
 msgid "No message"
 msgstr "沒有新郵件。"
 
-#: src/rpop3.c:901
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "刪除郵件"
 
-#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
-#: src/send_message.c:830
+#: src/rpop3.c:951 src/rpop3.c:963 src/rpop3.c:1021 src/rpop3.c:1219
+#: src/send_message.c:834
 #, c-format
 msgid "Quitting..."
 msgstr "離開中..."
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1006
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "取得新郵件中"
 
-#: src/rpop3.c:993
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "送出郵件"
 
-#: src/rpop3.c:1009
+#: src/rpop3.c:1029
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "取得新郵件中"
 
-#: src/rpop3.c:1122
+#: src/rpop3.c:1145
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "從 %s 中取得郵件中..."
 
-#: src/rpop3.c:1148
+#: src/rpop3.c:1171
 #, fuzzy
 msgid "Delete messages"
 msgstr "刪除郵件"
 
-#: src/rpop3.c:1149
+#: src/rpop3.c:1172
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6717,67 +6713,67 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "連線到 SMTP 伺服器 %s..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:765
+#: src/send_message.c:766
 #, fuzzy
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "送出命令時發生錯誤。\n"
 
-#: src/send_message.c:803
+#: src/send_message.c:807
 #, c-format
 msgid "Sending HELO..."
 msgstr "送出 HELO 標頭..."
 
-#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
+#: src/send_message.c:808 src/send_message.c:813 src/send_message.c:818
 msgid "Authenticating"
 msgstr "認證中..."
 
-#: src/send_message.c:805 src/send_message.c:810
+#: src/send_message.c:809 src/send_message.c:814
 msgid "Sending message..."
 msgstr "送出郵件中..."
 
-#: src/send_message.c:808
+#: src/send_message.c:812
 #, c-format
 msgid "Sending EHLO..."
 msgstr "送出 EHLO 標頭..."
 
-#: src/send_message.c:817
+#: src/send_message.c:821
 #, c-format
 msgid "Sending MAIL FROM..."
 msgstr "送出 MAIL FROM 標頭..."
 
-#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
+#: src/send_message.c:822 src/send_message.c:826 src/send_message.c:831
 msgid "Sending"
 msgstr "送信中"
 
-#: src/send_message.c:821
+#: src/send_message.c:825
 #, c-format
 msgid "Sending RCPT TO..."
 msgstr "送出 RCPT TO 標頭..."
 
-#: src/send_message.c:826
+#: src/send_message.c:830
 #, c-format
 msgid "Sending DATA..."
 msgstr "送出郵件資料 DATA..."
 
-#: src/send_message.c:858
+#: src/send_message.c:868
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "送出新郵件 (%d / %d 位元組)"
 
-#: src/send_message.c:863
+#: src/send_message.c:873
 #, c-format
 msgid "%d / %d bytes"
 msgstr ""
 
-#: src/send_message.c:892
+#: src/send_message.c:904
 msgid "Sending message"
 msgstr "送出郵件"
 
-#: src/send_message.c:937 src/send_message.c:961
+#: src/send_message.c:949 src/send_message.c:973
 msgid "Error occurred while sending the message."
 msgstr "送信時發生錯誤。"
 
-#: src/send_message.c:940
+#: src/send_message.c:952
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6786,12 +6782,12 @@ msgstr ""
 "送信時發生錯誤：\n"
 "%s"
 
-#: src/send_message.c:957
+#: src/send_message.c:969
 #, fuzzy
 msgid "Can't connect to SMTP server."
 msgstr "無法連線到新聞伺服器：%s:%d\n"
 
-#: src/send_message.c:959
+#: src/send_message.c:971
 #, fuzzy, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "無法連線到新聞伺服器：%s:%d\n"
@@ -6816,70 +6812,70 @@ msgstr "將數位簽章檢查結果"
 msgid "Checking signature"
 msgstr "檢查數位簽章中"
 
-#: src/sigstatus.c:208
+#: src/sigstatus.c:212
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s 來自 \"%s\""
 
-#: src/sigstatus.c:232
+#: src/sigstatus.c:236
 msgid "No signature found"
 msgstr "未發現簽章"
 
-#: src/sigstatus.c:239
+#: src/sigstatus.c:243
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "來自\"%s\" 的簽章檢查正確"
 
-#: src/sigstatus.c:240 src/textview.c:776
+#: src/sigstatus.c:244 src/textview.c:776
 msgid "Good signature"
 msgstr "簽章檢查正確"
 
-#: src/sigstatus.c:244
+#: src/sigstatus.c:248
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "此簽章是有效的，不過 \"%s\" 的金鑰不可信。"
 
-#: src/sigstatus.c:245 src/textview.c:778
+#: src/sigstatus.c:249 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "簽章有效 (不可信的金鑰)"
 
-#: src/sigstatus.c:250
+#: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but expired for \"%s\""
 msgstr "這份簽章已經在 \"%s\" 過期"
 
-#: src/sigstatus.c:251
+#: src/sigstatus.c:255
 msgid "Signature valid but expired"
 msgstr "簽章有效但已過期"
 
-#: src/sigstatus.c:254
+#: src/sigstatus.c:258
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
 msgstr "此簽章是有效的，不過 \"%s\" 的金鑰已過期"
 
-#: src/sigstatus.c:255
+#: src/sigstatus.c:259
 msgid "Signature valid but the signing key has expired"
 msgstr "此簽章是有效的，不過金鑰已過期"
 
-#: src/sigstatus.c:258
+#: src/sigstatus.c:262
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
 msgstr "此簽章是有效的，不過 \"%s\" 的金鑰已撤消"
 
-#: src/sigstatus.c:259
+#: src/sigstatus.c:263
 msgid "Signature valid but the signing key has been revoked"
 msgstr "此簽章是有效的，不過 \"%s\" 的金鑰已撤消"
 
-#: src/sigstatus.c:262
+#: src/sigstatus.c:266
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "來自 \"%s\" 的簽章檢查錯誤"
 
-#: src/sigstatus.c:263 src/textview.c:780
+#: src/sigstatus.c:267 src/textview.c:780
 msgid "BAD signature"
 msgstr "簽章檢查錯誤"
 
-#: src/sigstatus.c:266
+#: src/sigstatus.c:270
 msgid "No public key to verify the signature"
 msgstr "沒有公開金鑰供檢查簽章"
 
@@ -6977,7 +6973,7 @@ msgstr "無法取得收件人或收件新聞群組名單。"
 msgid "Can't retrieve newsgroup list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/subscribedialog.c:526 src/summaryview.c:911
+#: src/subscribedialog.c:526 src/summaryview.c:913
 msgid "Done."
 msgstr "完成"
 
@@ -7107,219 +7103,219 @@ msgstr "某些郵件已被標記。要繼續嗎？"
 msgid "Scanning folder (%s)..."
 msgstr "掃描資料夾 (%s)..."
 
-#: src/summaryview.c:1418
+#: src/summaryview.c:1420
 msgid "_Search again"
 msgstr "再次搜尋(_S)"
 
-#: src/summaryview.c:1439 src/summaryview.c:1448
+#: src/summaryview.c:1441 src/summaryview.c:1450
 msgid "No more unread messages"
 msgstr "沒有其他未讀郵件"
 
-#: src/summaryview.c:1440
+#: src/summaryview.c:1442
 msgid "No unread message found. Search from the end?"
 msgstr "沒有找到未讀郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1442
+#: src/summaryview.c:1444
 msgid "No unread messages."
 msgstr "沒有未讀郵件。"
 
-#: src/summaryview.c:1449
+#: src/summaryview.c:1451
 msgid "No unread message found. Go to next folder?"
 msgstr "沒有未讀郵件。要到下一個資料夾嗎？"
 
-#: src/summaryview.c:1457 src/summaryview.c:1466
+#: src/summaryview.c:1459 src/summaryview.c:1468
 msgid "No more new messages"
 msgstr "沒有其他新郵件"
 
-#: src/summaryview.c:1458
+#: src/summaryview.c:1460
 msgid "No new message found. Search from the end?"
 msgstr "沒有找到新郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1460
+#: src/summaryview.c:1462
 msgid "No new messages."
 msgstr "沒有新郵件。"
 
-#: src/summaryview.c:1467
+#: src/summaryview.c:1469
 msgid "No new message found. Go to next folder?"
 msgstr "沒有新郵件。要到下一個資料夾嗎？"
 
-#: src/summaryview.c:1475 src/summaryview.c:1484
+#: src/summaryview.c:1477 src/summaryview.c:1486
 msgid "No more marked messages"
 msgstr "沒有其他已標記郵件"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1478
 msgid "No marked message found. Search from the end?"
 msgstr "沒有找到已標記郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1478 src/summaryview.c:1487
+#: src/summaryview.c:1480 src/summaryview.c:1489
 msgid "No marked messages."
 msgstr "沒有已標記郵件。"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1487
 msgid "No marked message found. Search from the beginning?"
 msgstr "沒有找到已標記郵件。要從開頭繼續搜尋嗎？"
 
-#: src/summaryview.c:1493 src/summaryview.c:1502
+#: src/summaryview.c:1495 src/summaryview.c:1504
 msgid "No more labeled messages"
 msgstr "沒有已標記顏色之郵件"
 
-#: src/summaryview.c:1494
+#: src/summaryview.c:1496
 msgid "No labeled message found. Search from the end?"
 msgstr "沒有找到已標記顏色之郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1496 src/summaryview.c:1505
+#: src/summaryview.c:1498 src/summaryview.c:1507
 msgid "No labeled messages."
 msgstr "沒有已標記顏色之郵件。"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1505
 msgid "No labeled message found. Search from the beginning?"
 msgstr "沒有找到已標記顏色之郵件。要從開頭繼續搜尋嗎？"
 
-#: src/summaryview.c:1850
+#: src/summaryview.c:1852
 msgid "Attracting messages by subject..."
 msgstr "依主旨展開郵件中..."
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid "%d deleted"
 msgstr "%d 已刪除"
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 已移動"
 
-#: src/summaryview.c:2049 src/summaryview.c:2054
+#: src/summaryview.c:2051 src/summaryview.c:2056
 msgid ", "
 msgstr "， "
 
-#: src/summaryview.c:2053
+#: src/summaryview.c:2055
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 已複製"
 
-#: src/summaryview.c:2068
+#: src/summaryview.c:2070
 msgid " item(s) selected"
 msgstr " 封已選擇"
 
-#: src/summaryview.c:2090
+#: src/summaryview.c:2092
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 封未讀，%d 封已讀，共 %d 封(%s)"
 
-#: src/summaryview.c:2094
+#: src/summaryview.c:2096
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 封未讀，%d 封已讀，共 %d 封"
 
-#: src/summaryview.c:2130
+#: src/summaryview.c:2132
 msgid "Sorting summary..."
 msgstr "郵件排序中..."
 
-#: src/summaryview.c:2386
+#: src/summaryview.c:2388
 msgid "\tSetting summary from message data..."
 msgstr "\t產生郵件列表中..."
 
-#: src/summaryview.c:2388
+#: src/summaryview.c:2390
 msgid "Setting summary from message data..."
 msgstr "產生郵件列表中..."
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2497
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "寫入列表快取 (%s)..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2859
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "郵件 %d 已標記\n"
 
-#: src/summaryview.c:2923
+#: src/summaryview.c:2927
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "郵件 %d 已標記成已讀\n"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3128
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "郵件 %d 已標記成未讀\n"
 
-#: src/summaryview.c:3185
+#: src/summaryview.c:3189
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "郵件 %s/%d 已標記刪除\n"
 
-#: src/summaryview.c:3213
+#: src/summaryview.c:3217
 msgid "Delete message(s)"
 msgstr "刪除郵件"
 
-#: src/summaryview.c:3214
+#: src/summaryview.c:3218
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您確定要從刪除的郵件資料夾中刪除這封郵件嗎？"
 
-#: src/summaryview.c:3288
+#: src/summaryview.c:3292
 msgid "Deleting duplicated messages..."
 msgstr "刪除重覆的郵件..."
 
-#: src/summaryview.c:3326
+#: src/summaryview.c:3330
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "郵件 %s/%d 已消除標記\n"
 
-#: src/summaryview.c:3386
+#: src/summaryview.c:3390
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "郵件 %d 已設定移動到 %s\n"
 
-#: src/summaryview.c:3418
+#: src/summaryview.c:3422
 msgid "Destination is same as current folder."
 msgstr "目標資料夾與來源資料夾相同。"
 
-#: src/summaryview.c:3455
+#: src/summaryview.c:3459
 #, fuzzy
 msgid "Select folder to move"
 msgstr "選擇資料夾"
 
-#: src/summaryview.c:3485
+#: src/summaryview.c:3489
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "郵件 %d 已設定複製到 %s\n"
 
-#: src/summaryview.c:3516
+#: src/summaryview.c:3520
 msgid "Destination for copy is same as current folder."
 msgstr "郵件無法複製到同一個資料夾內。"
 
-#: src/summaryview.c:3552
+#: src/summaryview.c:3556
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "選擇資料夾"
 
-#: src/summaryview.c:3697
+#: src/summaryview.c:3701
 msgid "Error occurred while processing messages."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/summaryview.c:4003 src/summaryview.c:4004
+#: src/summaryview.c:4007 src/summaryview.c:4008
 msgid "Building threads..."
 msgstr "產生郵件串列中..."
 
-#: src/summaryview.c:4154 src/summaryview.c:4155
+#: src/summaryview.c:4158 src/summaryview.c:4159
 msgid "Unthreading..."
 msgstr "解除郵件串列中..."
 
-#: src/summaryview.c:4448 src/summaryview.c:4509
+#: src/summaryview.c:4452 src/summaryview.c:4513
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 msgid "filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4572
+#: src/summaryview.c:4576
 msgid "Filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4609
+#: src/summaryview.c:4613
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已過濾 %d 封郵件"
@@ -7412,35 +7408,41 @@ msgstr "將暫存資料夾中的郵件送出"
 msgid "E_xit"
 msgstr "離開"
 
-#: src/trayicon.c:198 src/trayicon.c:287
+#: src/trayicon.c:198 src/trayicon.c:290
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
-#: src/update_check.c:97 src/update_check.c:102
+#: src/update_check.c:112 src/update_check.c:117
 msgid ""
 "The newer version of Sylpheed found.\n"
 "Upgrade now?"
 msgstr ""
 
-#: src/update_check.c:105
+#: src/update_check.c:120
 #, fuzzy
 msgid "New version found"
 msgstr "未發現簽章"
 
-#: src/update_check.c:199
+#: src/update_check.c:216
 #, fuzzy
 msgid "Information"
 msgstr "伺服器資訊"
 
-#: src/update_check.c:200
+#: src/update_check.c:217
 #, fuzzy
 msgid "Sylpheed is already the latest version."
 msgstr "已經有 Sylpheed 程式正在執行中。\n"
 
-#: src/update_check.c:203
+#: src/update_check.c:220
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Can't open mark file.\n"
+#~ msgstr "無法開啟標記的檔案。\n"
+
+#~ msgid "g_thread is not supported by glib.\n"
+#~ msgstr "glib 不支援 g_thread。\n"
+
 #~ msgid "Importing file:"
 #~ msgstr "匯入檔案："