updated po files.

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

31 files changed, 2214 insertions, 2246 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 3ea034f8..21e27a1a 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-15
+
+	* updated fr.po, hu.po, cs.po and ro.po.
+
 2008-12-01
 
 	* updated pt_BR.po.
diff --git a/po/be.po b/po/be.po
index a883c3f6..b338eac2 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+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"
@@ -208,34 +208,34 @@ msgstr "iconv не можа канвертаваць UTF-7 у %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не можа канвертаваць %s у UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "нельга запісаць у часовы файл\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Атрыманне паведамленняў з %s у %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "нельга прачытаць файл mbox.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "няправільны фармат mbox: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "пашкоджаная скрыня: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "нельга адкрыць часовы файл\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -244,43 +244,43 @@ msgstr ""
 "знойдзены 'unescaped' From:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "нельга стварыць файл блакіроўкі %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "калі магчыма, ўжывайце 'flock' замест 'file'.\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "нельга стварыць %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "скрыня кантралюецца другім працэсам, чаканне...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "нельга блакіраваць %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "няправільны тып блакіроўкі\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "нельга разблакіраваць %s\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "нельга ўкараціць скрыню да нуля.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Экспартаванне паведамленняў з %s у %s...\n"
@@ -505,7 +505,7 @@ msgstr "Фільтр непажаданай пошты (ручны)"
 msgid "Junk mail filter"
 msgstr "Фільтр непажаданай пошты"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmine_get_text_content(): Канверсія коду схібіла.\n"
 
@@ -1203,7 +1203,7 @@ msgstr "Заўвага"
 msgid "Warning"
 msgstr "Папярэджанне"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Памылка"
 
@@ -2660,142 +2660,142 @@ msgstr "Імпарт файла LDIF у адрасную кнігу"
 msgid "Attributes"
 msgstr "Атрыбуты"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Сілфід: %d новых паведамленняў"
 
-#: src/inc.c:479
+#: src/inc.c:477
 msgid "Authenticating with POP3"
 msgstr "Аўтэнтыфікацыя POP3"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Атрыманне новых паведамленняў"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "Чаканне"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Скасаванае"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Атрыманне"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Зроблена (%d паведамленне(і) (%s) атрымана)"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Няма новых паведамленняў."
 
-#: src/inc.c:710
+#: src/inc.c:708
 #, fuzzy
 msgid "Done"
 msgstr "Зроблена."
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Злучэнне не атрымалася"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Аўтарызацыя схібіла"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Замкнута"
 
-#: src/inc.c:732
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Таймаут"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Завершана (%d новы(х) ліст(оў))"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Завершана (няма новых паведамленняў)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Здарыліся памылкі падчас атрымання пошты."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "атрыманне новых паведамленняў акаунта %s ...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Аўтэнтыфікацыя POP3"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Атрыманне новых паведамленняў"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Злучэнне з POP3 серверам: %s..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Нельга злучыцца з серверам POP3: %s:%d\n"
 
-#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Аўтэнтыфікацыя..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Атрыманне паведамленняў з %s..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Атрыманне колькасці новых паведамленняў (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Атрыманне колькасці новых паведамленняў (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Атрыманне колькасці новых паведамленняў (UIDL)"
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Атрыманне памеру паведамленняў (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Выдаленне паведамлення %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Адлучэнне"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Атрыманне ліста (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2803,15 +2803,15 @@ msgstr ""
 "Выкананне загаду фільтраванне спаму схібіла.\n"
 "Калі ласка, праверце настаўленні кантролю спаму."
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "Злучэнне не атрымалася."
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "Памылка здарылася падчас апрацоўкі пошты."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2820,29 +2820,29 @@ msgstr ""
 "Здарылася памылка падчас апрацоўкі пошты:\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Не засталося месца на дыску."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Нельга запісаць файл."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Памылка сокету."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "Злучэнне закрытае аддаленым серверам."
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "Скрыня замкнутая."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2851,11 +2851,11 @@ msgstr ""
 "Паштовая скрыня замкнутая:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Аўтэнтыфікацыя схібіла."
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2864,15 +2864,15 @@ msgstr ""
 "Аўтэнтыфікацыя схібіла:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Таймаут сеансу."
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Атрыманне скасаванае\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Атрыманне новых паведамленняў з %s у %s...\n"
diff --git a/po/bg.po b/po/bg.po
index 65d68a18..0af5809f 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+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"
@@ -214,77 +214,77 @@ msgstr "iconv не може да преобразува UTF-7 до %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може да преобразува %s до UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "не може да се запише във временен файл\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Получаване на съобщения от %s във %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "не може да се прочете mbox файл.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "невалиден mbox формат: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "деформиран mbox: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "не може да се отвори временен файл\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
 "%s"
 msgstr ""
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "не може да се създаде заключващ файл %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "използвайте 'flock' вместо 'file' ако е възможно.\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "не може да се създаде %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "кутията се притежава от друг процес, изчакване...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "не може да се заключи %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "невалиден тип заключване\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "не може да се отключи %s\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "пощенската кутия не може да се съкрати до нула.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Изнасяне на съобщения от %s във %s...\n"
@@ -506,7 +506,7 @@ msgstr "Папка"
 msgid "Junk mail filter"
 msgstr "Папка"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr ""
 
@@ -1219,7 +1219,7 @@ msgstr "Забележка"
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Грешка"
 
@@ -2741,158 +2741,158 @@ msgstr "Внасяне на LDIF файл в Адресната книга"
 msgid "Attributes"
 msgstr "Атрибути"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Завършено (%d нови съобщения)"
 
-#: src/inc.c:479
+#: src/inc.c:477
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Удостоверяване"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Получаване на нови съобщения"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "Изчакване"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Отказан"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Получаване"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Завършено (%d съобщения (%s) получени)"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Няма нови съобщения."
 
-#: src/inc.c:710
+#: src/inc.c:708
 #, fuzzy
 msgid "Done"
 msgstr "Изпълнено."
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Връзката се провали"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Удостоверяването се провали"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Заключен"
 
-#: src/inc.c:732
+#: src/inc.c:730
 #, fuzzy
 msgid "Timeout"
 msgstr "Пауза (сек)"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Завършено (%d нови съобщения)"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Завършено (няма нови съобщения)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Възникнаха грешки при получаване на пощата."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "получаване на нови съобщения от акаунт %s...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Удостоверяване"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Получаване на нови съобщения"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Свързване с POP3 сървър: %s..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не може да се установи връзка с POP3 сървър: %s:%d\n"
 
-#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Удостоверяване..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Получаване на съобщения от %s..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Взимане на броят на нови съобщения (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Взимане на броят на нови съобщения (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Взимане на броят на нови съобщения (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Взимане на размерът на съобщенията (LIST)... "
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Изтриване на съобщение %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Прекъсване"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получаване на съобшение (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "Връзката провалена"
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "Възникна грешка при обработка на пощата"
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2901,29 +2901,29 @@ msgstr ""
 "Възникна грешка при обработка на пощата:\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Няма свободно място на диска"
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Файлът не може да се запише."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Грешка в сокет."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "Връзката е прекратена от отдалечения хост."
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "Пощенската кутия е заключена."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2932,11 +2932,11 @@ msgstr ""
 "Пощенската кутия е заключена:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Удостоверяването се провали."
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2945,16 +2945,16 @@ msgstr ""
 "Удостоверяването се провали:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 #, fuzzy
 msgid "Session timed out."
 msgstr "сесията е просрочена\n"
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Обединяването е отменено\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Получаване на нови съобшения от %s в %s...\n"
diff --git a/po/cs.po b/po/cs.po
index 7b1fc089..3d3e1b25 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 11:36+0900\n"
-"PO-Revision-Date: 2008-10-19 15:27+0200\n"
+"POT-Creation-Date: 2008-12-15 17:55+0900\n"
+"PO-Revision-Date: 2008-12-06 19:19+0100\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Petr Kovar <pknbe@volny.cz>\n"
 "MIME-Version: 1.0\n"
@@ -216,34 +216,34 @@ msgstr "iconv nemůže provést konverzi z UTF-7 na %s\n"
 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:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "nelze zapisovat do dočasného souboru\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, 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:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "nelze přečíst soubor s poštovní schránkou.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "neplatný formát poštovní schránky: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "selhání poštovní schránky: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "nelze otevřít dočasný soubor\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -252,43 +252,43 @@ msgstr ""
 "nalezeno nezměněné záhlaví From:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "nelze vytvořit uzamčený soubor %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "pokud to jde, použijte \"flock\" namísto \"file\".\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "nelze vytvořit %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 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:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "nelze uzamknout %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "neplatný typ zámku\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "nelze odemknout %s\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "nelze smazat poštovní schránku.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportování zprávy z %s do %s...\n"
@@ -513,7 +513,7 @@ msgstr "Filtr nevyžádané pošty (ruční)"
 msgid "Junk mail filter"
 msgstr "Filtr nevyžádané pošty"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Neúspěšná konverze kódu.\n"
 
@@ -1207,7 +1207,7 @@ msgstr "Poznámka"
 msgid "Warning"
 msgstr "Varování"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Chyba"
 
@@ -2665,141 +2665,141 @@ msgstr "Importovat soubor LDIF do adresáře"
 msgid "Attributes"
 msgstr "Atributy"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: nových zpráv %d"
 
-#: src/inc.c:479
+#: src/inc.c:477
 msgid "Authenticating with POP3"
 msgstr "Autentizace přes POP3"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Přijímají se nové zprávy"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "V pohotovosti"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Zrušeno"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Přijímá se"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, c-format
 msgid "%d message(s) (%s) received"
 msgstr "zpráv %d, přijato (%s)"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, c-format
 msgid "no new messages"
 msgstr "žádné nové zprávy"
 
-#: src/inc.c:710
+#: src/inc.c:708
 msgid "Done"
 msgstr "Hotovo"
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Autentizace selhala"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Zamknuto"
 
-#: src/inc.c:732
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Čas vypršel"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Dokončeno (nových zpráv %d)"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Dokončeno (žádné nové zprávy)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Během načítání zpráv se vyskytly chyby."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, 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:832
+#: src/inc.c:830
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Autentizace přes POP3"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Přijímají se nové zprávy"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Připojování k serveru POP3: %s..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, 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:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentizace..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Přijímají se zprávy z %s..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Zjišťuje se počet nových zpráv (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Zjišťuje se počet nových zpráv (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Zjišťuje se počet nových zpráv (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Zjišťuje se velikost zpráv (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Vymazávání zprávy %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Ukončování"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Přijímá se zpráva (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2807,15 +2807,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:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "Spojení selhalo."
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "Během zpracovávání pošty se vyskytla chyba."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2824,29 +2824,29 @@ msgstr ""
 "Během zpracovávání pošty se vyskytla chyba:\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Na disku není volné místo."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Nelze zapisovat do souboru."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Chyba socketu."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "Spojení ukončeno vzdáleným hostitelem."
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "Poštovní schránka je zamčena."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2855,11 +2855,11 @@ msgstr ""
 "Poštovní schránka je zamčena:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Autentizace selhala."
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2868,15 +2868,15 @@ msgstr ""
 "Autentizace selhala:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Vypršel čas relace."
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Začleňování zrušeno\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Získávají se nové zprávy z %s do %s...\n"
@@ -3805,9 +3805,8 @@ msgid "Exit this program?"
 msgstr "Opravdu ukončit Sylpheed?"
 
 #: src/mainwindow.c:3793
-#, fuzzy
 msgid "Select folder to open"
-msgstr "Vybrat složku"
+msgstr "Vyberte složku, kterou chcete otevřít"
 
 #: src/mainwindow.c:3943
 msgid "Command line options"
@@ -6320,23 +6319,20 @@ msgid "Error verifying the signature"
 msgstr "Chyba při ověřování podpisu"
 
 #: src/rpop3.c:242
-#, fuzzy
 msgid "_File"
-msgstr "/_Soubor"
+msgstr "_Soubor"
 
 #: src/rpop3.c:243 src/rpop3.c:436
 msgid "_Get"
 msgstr "_Přijmout"
 
 #: src/rpop3.c:248
-#, fuzzy
 msgid "_Help"
-msgstr "/Nápo_věda"
+msgstr "Nápo_věda"
 
 #: src/rpop3.c:249
-#, fuzzy
 msgid "_About"
-msgstr "O aplikaci"
+msgstr "O _aplikaci"
 
 #: src/rpop3.c:338
 #, c-format
@@ -7026,7 +7022,7 @@ msgstr "Zpráva %d je označena jako nepřečtená\n"
 #: src/summaryview.c:3157
 #, c-format
 msgid "Message %s/%d is set to delete\n"
-msgstr "Zpráva %s/%d je nastavena na smazání\n"
+msgstr "Zpráva %s/%d je připravena na smazání\n"
 
 #: src/summaryview.c:3185
 msgid "Delete message(s)"
@@ -7048,30 +7044,28 @@ msgstr "Zpráva %s/%d má zrušeno označení\n"
 #: src/summaryview.c:3358
 #, c-format
 msgid "Message %d is set to move to %s\n"
-msgstr "Zpráva %d je nastavena na přesun do %s\n"
+msgstr "Zpráva %d je připravena na přesun do %s\n"
 
 #: src/summaryview.c:3390
 msgid "Destination is same as current folder."
 msgstr "Cílová položka je stejná jako aktuální složka."
 
 #: src/summaryview.c:3427
-#, fuzzy
 msgid "Select folder to move"
-msgstr "Vybrat složku"
+msgstr "Vyberte složku, kterou chcete přesunout"
 
 #: src/summaryview.c:3457
 #, c-format
 msgid "Message %d is set to copy to %s\n"
-msgstr "Zpráva %d je nastavena na zkopírování do %s\n"
+msgstr "Zpráva %d je připravena na zkopírování do %s\n"
 
 #: src/summaryview.c:3488
 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:3524
-#, fuzzy
 msgid "Select folder to copy"
-msgstr "Vybrat složku"
+msgstr "Vyberte složku, kterou chcete kopírovat"
 
 #: src/summaryview.c:3669
 msgid "Error occurred while processing messages."
@@ -7192,6 +7186,3 @@ msgstr "Ukonči_t"
 #: src/trayicon.c:198 src/trayicon.c:287
 msgid "Sylpheed"
 msgstr "Sylpheed"
-
-#~ msgid "%d messages found.\n"
-#~ msgstr "nalezených zpráv %d.\n"
diff --git a/po/da.po b/po/da.po
index 47005517..d2975164 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -214,34 +214,34 @@ msgstr "iconv kan ikke konvertere UTF-7 til %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv can ikke konvertere %s til UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "kan ikke skrive til midlertidig fil\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Modtager meddelelse fra %s til %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "Kan ikke læse mbox fil.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "ugyldigt mbox format: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "ugyldig mbox format: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "kan ikke åbne midlertidig fil\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -250,43 +250,43 @@ msgstr ""
 "ukodet Fra fundet:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "kan ikke oprette lock fil %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "benyt 'flock' i stedet for 'file' hvis muligt.\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "kan ikke oprette %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "mailbox hører til anden process, venter...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "kan ikke låse %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "ugyldig lock type\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "kan ikke låse %s op\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "kan ikke tømme mailbox.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Eksporterer meddelelse fra %s til %s...\n"
@@ -510,7 +510,7 @@ msgstr "Mappe"
 msgid "Junk mail filter"
 msgstr "Mappe"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Tegnsæt konverteringsfejl.\n"
 
@@ -1217,7 +1217,7 @@ msgstr "Note"
 msgid "Warning"
 msgstr "Advarsel"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Fejl"
 
@@ -2740,161 +2740,161 @@ msgstr "Importer LDIF fil til adressebog"
 msgid "Attributes"
 msgstr "Egenskaber"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Hentet (%d nye meddelelse(r))"
 
-#: src/inc.c:479
+#: src/inc.c:477
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Godkender"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Modtager nu meddelelse"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "Vent"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Afbrudt"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Modtager"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Hentet (%d meddelelse(r) (%s)"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Ingen nye meddelelser."
 
-#: src/inc.c:710
+#: src/inc.c:708
 msgid "Done"
 msgstr "Afsluttet"
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Forbindelse mislykkedes"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Godkendelse mislykkedes"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Låst"
 
-#: src/inc.c:732
+#: src/inc.c:730
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Hentet (%d nye meddelelse(r))"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Ingen nye meddelelser"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Fejl ved hentning af e-post."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "modtager nye meddelelser fra konto %s...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Godkender"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: henter nye meddelelser"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Forbinder til POP3 server: %s ..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ingen forbindelse med POP3 server: %s:%d\n"
 
-#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Godkender..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Modtager meddelelse fra %s..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Modtager antal nye meddelelser (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Modtager antal nye meddelelser (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Modtager antal nye meddelelser (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Modtager antal nye meddelelser (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Sletter meddelelse %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Afslutter"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Modtager meddelelse (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 #, fuzzy
 msgid "Connection failed."
 msgstr "Forbindelse mislykkedes"
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 #, fuzzy
 msgid "Error occurred while processing mail."
 msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2903,30 +2903,30 @@ msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Ingen fri disk plads."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Kan ikke skrive til fil."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Sokkel fejl."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "postkasse er låst\n"
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2935,11 +2935,11 @@ msgstr ""
 "Mailbox er låst:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Godkendelses fejlede."
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2948,16 +2948,16 @@ msgstr ""
 "Godkendelsesfejl:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 #, fuzzy
 msgid "Session timed out."
 msgstr "tid udløbet\n"
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Hentning afbrudt\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Modtager nye meddelelser fra %s til %s...\n"
diff --git a/po/de.po b/po/de.po
index 7901d48e..695fd0c4 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+0900\n"
 "PO-Revision-Date: 2007-09-29 23:16+0100\n"
 "Last-Translator: Joo Martin <debian@joomart.de>\n"
 "Language-Team: de\n"
@@ -212,34 +212,34 @@ msgstr "iconv kann UTF-7 nicht nach %s konvertieren\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kann %s nicht nach UTF-7  konvertieren\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "kann nicht in temporäre Datei schreiben\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Erhaltene Nachrichten von %s in %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "Kann Mbox-Datei nicht lesen.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "Ungültiges Mbox-Format: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "zerstörte Mbox: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "kann temporäre Datei nicht öffnen\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -248,43 +248,43 @@ msgstr ""
 "uncodiertes Von gefunden:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "kann Sperrdatei %s nicht erstellen\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "Benutze, wenn möglich, 'flock' anstatt 'file'.\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "Kann %s nicht erstellen\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "Mailbox gehört einem anderen Prozess, warten...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "kann %s nicht sperren\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "ungültiger Sperrtyp\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "kann %s nicht entperren\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "Kann Mailbox nicht auf null setzen.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportiere Nachrichten von %s in %s...\n"
@@ -508,7 +508,7 @@ msgstr "Manueller Spam-Mail Filter"
 msgid "Junk mail filter"
 msgstr "Spam-Mail Filter"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Zeichensatzumsetzung fehlgeschlagen.\n"
 
@@ -1211,7 +1211,7 @@ msgstr "Notiz"
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Fehler"
 
@@ -2674,142 +2674,142 @@ msgstr "Importiere LDIF-Datei in Adressbuch"
 msgid "Attributes"
 msgstr "Eigenschaften"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d neue Nachricht(en)"
 
-#: src/inc.c:479
+#: src/inc.c:477
 msgid "Authenticating with POP3"
 msgstr "Beglaubigen mit POP3"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Empfange neue Nachricht"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "Warten"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Empfange"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Fertig (%d Nachricht(en) (%s) empfangen)"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Keine neuen Nachrichten."
 
-#: src/inc.c:710
+#: src/inc.c:708
 #, fuzzy
 msgid "Done"
 msgstr "Fertig."
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Beglaubigung fehlgeschlagen"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Blockiert"
 
-#: src/inc.c:732
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Timeout"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Beendet (%d neue Nachricht(en))"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Beendet (keine neuen Nachrichten)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Fehler während des Empfanges der E-Mails."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "erhalte neue Nachrichten vom Account %s...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Beglaubigen mit POP3"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Empfange neue Nachrichten"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Verbinde mit POP3-Server: %s..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Keine Verbindung mit POP3-Server: %s:%d\n"
 
-#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Beglaubigen..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Erhaltene Nachrichten von %s..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Lösche Nachricht %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Beenden"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Empfange Nachricht (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2817,15 +2817,15 @@ msgstr ""
 "Ausführung des Spamfilter-Kommandos fehlgeschlagen.\n"
 "Bite überprüfen Sie die Spamfilter-Einstellungen."
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "Verbindung fehlgeschlagen."
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "Fehler beim Verarbeiten der E-Mail."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2834,29 +2834,29 @@ msgstr ""
 "Fehler beim Verarbeiten der E-Mail:\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Kein Platz mehr auf der Festplatte."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Kann Datei nicht schreiben."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Socket-Fehler."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "Verbindung geschlossen vom Remote-Host."
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "Mailbox ist blockiert."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2865,11 +2865,11 @@ msgstr ""
 "Mailbox ist gesperrt:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Beglaubigung fehlgeschlagen."
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2878,15 +2878,15 @@ msgstr ""
 "Beglaubigung fehlgeschlagen:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Sitzungszeit abgelaufen."
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Empfangen abgebrochen\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Erhalte neue Nachrichten von %s in %s...\n"
diff --git a/po/el.po b/po/el.po
index 71eae9a7..9c189f86 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+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"
@@ -218,77 +218,77 @@ msgstr "Δεν είναι δυνατή η μετατροπή του UTF-7 σε %
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "Δεν είναι δυνατή η μετατροπή του %s σε UTF-7 από το iconv\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "δεν είναι δυνατή η εγγραφή στο προσωρινό αρχείο\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, fuzzy, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Μετακίνηση μηνυμάτων στο φάκελο %s"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "δεν είναι δυνατή η ανάγνωση από το αρχείο mbox.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "μη έγκυρη μορφή mbox: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "κακοσχηματισμένο mbox: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "δεν είναι δυνατό το άνοιγμα του προσωρινού αρχείου\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, fuzzy, c-format
 msgid ""
 "unescaped From found:\n"
 "%s"
 msgstr "Το αρχείο δε βρέθηκε."
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "δεν είναι δυνατή η δημιουργία αρχείου κλειδώματος %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr ""
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "δεν είναι δυνατή η δημιουργία του %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "το γραμματοκιβώτιο ανήκει σε άλλη διεργασία, αναμονή...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "δεν είναι δυνατό το κλείδωμα του %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "μη έγκυρος τύπος κλειδιού\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "δεν είναι δυνατό το ξεκλείδωμα του %s\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "δεν είναι δυνατή η περικοπή του γραμματοκιβωτίου σε μηδενικό.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Εξαγωγή μηνυμάτων από το %s στο %s...\n"
@@ -514,7 +514,7 @@ msgstr "Φίλτρο ανεπιθύμητης αλληλογραφίας (χει
 msgid "Junk mail filter"
 msgstr "Φίλτρο ανεπιθύμητης αλληλογραφίας"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Η μετατροπή του κώδικα απέτυχε.\n"
 
@@ -1238,7 +1238,7 @@ msgstr "Σημείωση"
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -2729,157 +2729,157 @@ msgstr "Εισαγωγή αρχείου LDIF στο ευρετήριο διευ�
 msgid "Attributes"
 msgstr "Γνωρίσματα"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d νέα μηνύματά"
 
-#: src/inc.c:479
+#: src/inc.c:477
 msgid "Authenticating with POP3"
 msgstr "Πιστοποίηση με POP3"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Λήψη νέων μηνυμάτων"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "Σε αναμονή"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Ακυρώθηκε"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Λήψη"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Ολοκληρώθηκε (%d μηνύματα (%s) παρελήφθησαν)"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Δεν υπάρχουν νέα μηνύματα."
 
-#: src/inc.c:710
+#: src/inc.c:708
 #, fuzzy
 msgid "Done"
 msgstr "Έγινε."
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Η εντολή Auth απέτυχε"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Κλειδωμένο"
 
-#: src/inc.c:732
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Όριο χρόνου"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Ολοκληρώθηκε (%d νέα μηνύματα)"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Ολοκληρώθηκε (δεν υπάρχουν νέα μηνύματα)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 #, fuzzy
 msgid "Some errors occurred while getting mail."
 msgstr "Συνέβησαν σφάλματα κατά την αποστολή των μηνυμάτων στην ουρά."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "λήψη νέων μηνυμάτων λογαριασμού %s...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Πιστοποίηση με POP3"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Λήψη νέων μηνυμάτων"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Σύνδεση με το διακομιστή POP3: %s..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Δεν μπορώ να συνδεθώ στον POP3 server: %s:%d\n"
 
-#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Πιστοποίηση..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Λήψη μηνυμάτων από %s..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Λήψη αριθμού νέων μηνυμάτων (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Λήψη αριθμού νέων μηνυμάτων (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Λήψη αριθμού νέων μηνυμάτων (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Λήψη μεγέθους μηνυμάτων (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Διαγραφή μηνύματος %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Κλείνω τη σύνδεση"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Λαμβάνεται το μήνυμα (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "Η σύνδεση απέτυχε."
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το μήνυμα."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2888,29 +2888,29 @@ msgstr ""
 "Δημιουργήθηκε σφάλμα κατά την επεξεργασία μηνυμάτων:\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Δεν υπάρχει άλλος χώρος στο δίσκο."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Δεν είναι δυνατή η εγγραφή του αρχείου."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Σφάλμα σύνδεσης."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "Η σύνδεση έκλεισε από τον απομακρυσμένο υπολογιστή."
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "Το γραμματοκιβώτιο είναι κλειδωμένο."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2919,11 +2919,11 @@ msgstr ""
 "Το γραμματοκιβώτιο είναι κλειδωμένο:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Η πιστοποίηση απέτυχε."
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2932,15 +2932,15 @@ msgstr ""
 "Η πιστοποίηση απέτυχε:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Λήξη χρόνου σύνδεσης."
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Η ενσωμάτωση ακυρώθηκε\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Λήψη μηνυμάτων από %s στο %s ...\n"
diff --git a/po/es.po b/po/es.po
index b928045f..d62f7b88 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+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"
@@ -210,34 +210,34 @@ msgstr "iconv no puede convertir UTF-7 a %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv no puede convertir %s a UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "no se puede escribir el fichero temporal\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Obteniendo mensajes desde %s en %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "no puedo leer el fichero mbox.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "formato de mbox inválido: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "mbox mal formada: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "no se puede abrir el fichero temporal\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -246,43 +246,43 @@ msgstr ""
 "Encontrado «From» sin proteger:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "no se puede crear el fichero de bloqueo %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "usar «flock» en vez de «file» si es posible.\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "no puedo crear %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "el buzón esta siendo usado por otro proceso, esperando...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "no se puede bloquear %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "tipo de bloqueo no válido\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "no se puede desbloquear %s\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "no se puede truncar a cero el buzón.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportando mensajes de %s a %s...\n"
@@ -507,7 +507,7 @@ msgstr "Filtro de correo basura (manual)"
 msgid "Junk mail filter"
 msgstr "Filtro de correo basura"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Conversión de códigos fallida.\n"
 
@@ -1208,7 +1208,7 @@ msgstr "Notificación"
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Error"
 
@@ -2668,142 +2668,142 @@ msgstr "Importar fichero LDIF a la agenda"
 msgid "Attributes"
 msgstr "Atributos"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d mensajes nuevos"
 
-#: src/inc.c:479
+#: src/inc.c:477
 msgid "Authenticating with POP3"
 msgstr "Autentificando con POP3"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Obteniendo nuevos mensajes"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Hecho (%d mensaje(s) (%s) recibido(s))"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "No hay mensajes nuevos."
 
-#: src/inc.c:710
+#: src/inc.c:708
 #, fuzzy
 msgid "Done"
 msgstr "Hecho."
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Conexión fallida"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Authorización fallida"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:732
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Tiempo límite"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finalizado (%d mensaje(s) nuevo(s))"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Finalizado (no hay mensajes nuevos)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Hubo algún error obteniendo el correo."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obteniendo nuevos mensajes de la cuenta %s...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Autentificando con POP3"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando nuevos mensajes"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando al servidor POP3: %s..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, 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:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentificando..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obteniendo mensajes desde %s..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obteniendo el número de nuevos mensajes (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obteniendo el número de nuevos mensajes (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obteniendo el número de nuevos mensajes (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obteniendo el tamaño de nuevos mensajes (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Borrando mensaje %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Saliendo"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaje (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2811,15 +2811,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:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "Conexión fallida."
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "Hubo un error mientras se procesaba el correo."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2828,29 +2828,29 @@ msgstr ""
 "Hubo un error procesando el correo:\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "No hay espacio libre en disco."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "No se puede escribir el fichero."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Error de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "Conexión cerrada por la máquina remota."
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "El buzón esta bloqueado."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2859,11 +2859,11 @@ msgstr ""
 "El buzón está bloqueado:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "La autentificación falló."
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2872,15 +2872,15 @@ msgstr ""
 "La autentificación falló:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Se agotó el tiempo de espera de la sesión."
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obteniendo nuevos mensajes desde %s en %s...\n"
diff --git a/po/et.po b/po/et.po
index 87c00855..e218ed4d 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+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"
@@ -217,34 +217,34 @@ msgstr "iconv ei suuda konversteerida UTF-7-t %s-ks\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ei suuda konverteerida %s-i UTF-7-ks\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "ei suuda kirjutada ajutisse faili\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "Ei saa lugeda kirjakasti faili.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "sobimatu kirjakasti formaat: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "paha mbox: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "ei saa avada ajutist fili\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -253,43 +253,43 @@ msgstr ""
 "Vabanematuid (kellelt) leitud:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "ei saa luua lukufaili %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "kasuta 'flock'-i 'file' asemel kui võimalik.\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "ei suuda luua %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "kirjakasti kasutab teine protsess, ootan...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "ei suuda lukustada %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "vale luku tüüp\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "ei saa lukku eemaldada %s-lt\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "kirjakasti ei saa lõigata nulliks.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Ekspordime teated %s-ist %s-i ...\n"
@@ -513,7 +513,7 @@ msgstr "Kaust"
 msgid "Junk mail filter"
 msgstr "Kaust"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Koodi muundamine ebaõnnestus.\n"
 
@@ -1224,7 +1224,7 @@ msgstr "Märkus"
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Viga"
 
@@ -2752,216 +2752,216 @@ msgstr "Impordi LDIF fail aadressiraamatusse"
 msgid "Attributes"
 msgstr "Atribuudid"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Lõpetatud (%d uut kirja)"
 
-#: src/inc.c:479
+#: src/inc.c:477
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autoriseerimine"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Võtan uusi kirju"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "*Juures"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Katkestatud"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Tirin"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Valmis (%d kirja (%s)-st võetud)"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Uusi kirju ei ole."
 
-#: src/inc.c:710
+#: src/inc.c:708
 msgid "Done"
 msgstr "Tehtud"
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Ühendus ebaõnnestus"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Autoriseerimine ebaõnnestus"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Lukustatud"
 
-#: src/inc.c:732
+#: src/inc.c:730
 #, fuzzy
 msgid "Timeout"
 msgstr "Ajalimiit (sek)"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Lõpetatud (%d uut kirja)"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Lõpetatud (uusi kirju pole)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Tekksiid mõned vead kirjade võtmisel."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "võtan uued kirjad kontolt %s...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autoriseerimine"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Uute kirjade võtmine"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Ühendan POP3 serveriga: %s ..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ei suuda ühenduda POP3 serveriga %s:%d\n"
 
-#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Autoriseerin..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Võtan uute kirjade arvu (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Võtan kirjade suuruse (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Kustutan kirja %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Väljun"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Võtan kirja (%d /%d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 #, fuzzy
 msgid "Connection failed."
 msgstr "Ühendus ebaõnnestus"
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Ketas täis."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 #, fuzzy
 msgid "Can't write file."
 msgstr "Ei saa kirjutada faili.\n"
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 #, fuzzy
 msgid "Socket error."
 msgstr "Soketi viga\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Sissekanne peatatud\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Võtame uued teated %s-ist %s-i.\n"
diff --git a/po/fr.po b/po/fr.po
index 56538def..240cece0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 11:36+0900\n"
-"PO-Revision-Date: 2008-06-06 13:42+0200\n"
+"POT-Creation-Date: 2008-12-15 17:55+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"
 "MIME-Version: 1.0\n"
@@ -220,34 +220,34 @@ msgstr "iconv ne peut convertir de UTF-7 vers %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne peut convertir de %s vers UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "Impossible d'écrire dans le fichier temporaire\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Réception des messages de %s dans %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "Impossible de lire le fichier mbox.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "Format mbox invalide : %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "mbox mal formée : %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "Impossible d'ouvrir un fichier temporaire\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -256,43 +256,43 @@ msgstr ""
 "From 'unescaped' trouvé :\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "Impossible de créer le fichier verrou %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "Utilisation de 'flock' à la place de 'file' si possible\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "Impossible de créer %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "mailbox utilisée par un autre processus, attente...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "Impossible de verrouiller %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "Type de verrou invalide\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "Impossible de déverrouiller %s\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "Impossible de vider la boîte aux lettres.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportation des messages de %s vers %s...\n"
@@ -520,7 +520,7 @@ msgstr "Tri (manuel) des indésirables"
 msgid "Junk mail filter"
 msgstr "Dossier des messages indésirables"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content() : la conversion de code a échoué.\n"
 
@@ -1224,7 +1224,7 @@ msgstr "Information"
 msgid "Warning"
 msgstr "Avertissement"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Erreur"
 
@@ -1628,7 +1628,7 @@ msgstr "Pièce jointe absente"
 
 #: src/compose.c:2922
 msgid "There is no attachment. Send it without attachments?"
-msgstr "Il n'y a pas de pièce jointe. Envoyer sans pièce jointe?"
+msgstr "Il n'y a pas de pièce jointe. Envoyer sans pièce jointe ?"
 
 #: src/compose.c:3039 src/compose.c:3065
 msgid "Check recipients"
@@ -1636,7 +1636,7 @@ msgstr "Vérification des destinataires"
 
 #: src/compose.c:3085
 msgid "Really send this mail to the following addresses?"
-msgstr "Vraiment envoyer ce courrier aux adresses suivantes?"
+msgstr "Vraiment envoyer ce courrier aux adresses suivantes ?"
 
 #: src/compose.c:3098 src/compose.c:4976 src/headerview.c:54
 msgid "From:"
@@ -1740,7 +1740,7 @@ msgstr ""
 "chiffré, tous ces destinataires seront visibles par examen de la clé de "
 "chiffrement, annulant toute confidentialité.\n"
 "\n"
-"Envoyer quand même?"
+"Envoyer quand même ?"
 
 #: src/compose.c:4046
 msgid "can't remove the old message\n"
@@ -2199,7 +2199,7 @@ msgstr "Remplacer le fichier existant ?"
 
 #: src/filesel.c:166 src/filesel.c:280
 msgid "The file already exists. Do you want to replace it?"
-msgstr "Le fichier existe déjà. Voulez-vous le remplacer?"
+msgstr "Le fichier existe déjà. Voulez-vous le remplacer ?"
 
 #: src/filesel.c:183
 msgid "Select directory"
@@ -2691,142 +2691,141 @@ msgstr "Importation d'un fichier LDIF dans un carnet d'adresses"
 msgid "Attributes"
 msgstr "Attributs"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed : %d nouveau(x) message(s)"
 
-#: src/inc.c:479
+#: src/inc.c:477
 msgid "Authenticating with POP3"
 msgstr "Authentification POP3"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Récupération des nouveaux messages"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "Attente"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Annulé"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Récupération"
 
-#: src/inc.c:705 src/inc.c:1015
-#, fuzzy, c-format
+#: src/inc.c:703 src/inc.c:1013
+#, c-format
 msgid "%d message(s) (%s) received"
-msgstr "Terminé - %d message(s) %s reçu(s)"
+msgstr "%d message(s) (%s) reçu(s)"
 
-#: src/inc.c:709
-#, fuzzy, c-format
+#: src/inc.c:707
+#, c-format
 msgid "no new messages"
-msgstr "Pas de nouveaux messages."
+msgstr "pas de nouveau message"
 
-#: src/inc.c:710
-#, fuzzy
+#: src/inc.c:708
 msgid "Done"
-msgstr "Terminé."
+msgstr "Terminé"
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "La connexion a échoué"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "L'authentification a échoué"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Verrouillé"
 
-#: src/inc.c:732
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Délai d'attente"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Terminé - %d nouveau(x) message(s)"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Terminé - pas de nouveau(x) message(s)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Erreur lors de la récupération des messages."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "Récupération des nouveaux messages du compte %s ...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s : Authentification POP3"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Récupération des nouveaux messages"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Connexion au serveur POP3 : %s..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, 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:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Authentification..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Réception des messages de %s..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Récupération du nombre de nouveaux messages (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Récupération du nombre de nouveaux messages (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Récupération du nombre de nouveaux messages (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Récupération de la taille des messages (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Suppression du message %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Fermeture"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Récupération du message (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2834,15 +2833,15 @@ msgstr ""
 "Erreur dans la gestion des messages indésirables.\n"
 "Vérifier les paramètres."
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "La connexion a échoué."
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "Une erreur est survenue pendant le traitement du message."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2851,29 +2850,29 @@ msgstr ""
 "Une erreur est survenue pendant le traitement du message :\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Plus de place disponible sur le disque."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Impossible d'écrire dans le fichier."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Erreur de protocole."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "La connexion a été fermée par le serveur."
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "Boîte verrouillée."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2882,11 +2881,11 @@ msgstr ""
 "Boîte verrouillée :\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "L'authentification à échoué."
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2895,15 +2894,15 @@ msgstr ""
 "L'authentification a échoué :\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Dépassement du délai de réponse (timeout) de la session."
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Relève du courrier annulée\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Récupération des nouveaux messages de %s dans %s...\n"
@@ -3453,9 +3452,8 @@ msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Message/Réce_ptionner/_Annuler la réception"
 
 #: src/mainwindow.c:776
-#, fuzzy
 msgid "/_Message/Recei_ve/_Remote mailbox..."
-msgstr "/_Message/Réce_ptionner/le courrier de _tous les comptes"
+msgstr "/_Message/Réce_ptionner/boîte aux lettres électronique à _distance..."
 
 #: src/mainwindow.c:778
 msgid "/_Message/Recei_ve/---"
@@ -3843,9 +3841,8 @@ msgid "Exit this program?"
 msgstr "Quitter Sylpheed ?"
 
 #: src/mainwindow.c:3793
-#, fuzzy
 msgid "Select folder to open"
-msgstr "Choix d'un dossier"
+msgstr "Choix d'un dossier à ouvrir"
 
 #: src/mainwindow.c:3943
 msgid "Command line options"
@@ -5167,7 +5164,9 @@ msgstr "Si désactivé, les messages resteront marqués jusqu'à exécution."
 
 #: src/prefs_common_dialog.c:2240
 msgid "Make the order of buttons comply with GNOME HIG"
-msgstr "Mettre les boutons en conformité avec les « HIG » GNOME"
+msgstr ""
+"Mettre les boutons en conformité avec le guide de l'interface humanisée de "
+"Gnome (GNOME HIG)"
 
 #: src/prefs_common_dialog.c:2243
 msgid "Display tray icon"
@@ -6095,14 +6094,12 @@ msgid "Incorporate new mail of all accounts"
 msgstr "Relever le courrier de tous les comptes"
 
 #: src/prefs_toolbar.c:47
-#, fuzzy
 msgid "Remote mailbox"
-msgstr "Suppression d'une boîte aux lettres"
+msgstr "Boîte à distance"
 
 #: src/prefs_toolbar.c:48
-#, fuzzy
 msgid "POP3 Remote mailbox"
-msgstr "Suppression d'une boîte aux lettres"
+msgstr "Boîte POP3 à distance"
 
 #: src/prefs_toolbar.c:51
 msgid "Send queued message(s)"
@@ -6283,9 +6280,8 @@ msgid "Status"
 msgstr "État"
 
 #: src/progressdialog.c:145
-#, fuzzy
 msgid "Progress"
-msgstr "Propriétés"
+msgstr "Progression"
 
 #: src/query_search.c:425
 msgid "_Save as search folder"
@@ -6379,75 +6375,70 @@ msgid "Error verifying the signature"
 msgstr "Erreur lors de la vérification de la signature"
 
 #: src/rpop3.c:242
-#, fuzzy
 msgid "_File"
-msgstr "/_Fichier"
+msgstr "_Fichier"
 
 #: src/rpop3.c:243 src/rpop3.c:436
-#, fuzzy
 msgid "_Get"
-msgstr "Relever"
+msgstr "_Relever"
 
 #: src/rpop3.c:248
-#, fuzzy
 msgid "_Help"
-msgstr "/A_ide"
+msgstr "A_ide"
 
 #: src/rpop3.c:249
-#, fuzzy
 msgid "_About"
-msgstr "À propos"
+msgstr "À _propos"
 
 #: src/rpop3.c:338
-#, fuzzy, c-format
+#, c-format
 msgid "%s - POP3 Remote mailbox"
-msgstr "Suppression d'une boîte aux lettres"
+msgstr "%s - boîte POP3 à distance"
 
 #: src/rpop3.c:414 src/summaryview.c:5093
 msgid "No."
 msgstr "N°"
 
 #: src/rpop3.c:497
-#, fuzzy, c-format
+#, c-format
 msgid "Connecting to %s:%d ..."
-msgstr "Connection au serveur SMTP : %s ..."
+msgstr "Connection à %s:%d ..."
 
 #: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
-#, fuzzy, c-format
+#, c-format
 msgid "Can't connect to POP3 server: %s:%d"
-msgstr "Impossible de se connecter au serveur POP3 : %s:%d\n"
+msgstr "Impossible de se connecter au serveur POP3 : %s:%d"
 
 #: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
-#, fuzzy
 msgid "Error occurred during POP3 session."
-msgstr "une erreur est survenue pendant la session POP3\n"
+msgstr "Une erreur est survenue pendant la session POP3."
 
 #: src/rpop3.c:533
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
-msgstr "une erreur est survenue pendant la session POP3\n"
+msgstr ""
+"Une erreur est survenue pendant la session POP3 :\n"
+"%s"
 
 #: src/rpop3.c:686
-#, fuzzy, c-format
+#, c-format
 msgid "Retrieving message headers (%d / %d) ..."
-msgstr "Réception des en-têtes de message (%d / %d)"
+msgstr "Réception des en-têtes de message (%d / %d) ..."
 
 #: src/rpop3.c:846
-#, fuzzy
 msgid "Getting the number of messages..."
-msgstr "Récupération du nombre de nouveaux messages (STAT)..."
+msgstr "Récupération du nombre de messages..."
 
 #: src/rpop3.c:855 src/rpop3.c:868
-#, fuzzy
 msgid "No message"
-msgstr "Pas de nouveaux messages."
+msgstr "Pas de message"
 
 #: src/rpop3.c:901
-#, fuzzy, c-format
+#, c-format
 msgid "Deleted %d messages"
-msgstr "Suppression de message(s)"
+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
@@ -6456,35 +6447,36 @@ msgid "Quitting..."
 msgstr "Fermeture..."
 
 #: src/rpop3.c:986
-#, fuzzy, c-format
+#, c-format
 msgid "Retrieved %d messages"
-msgstr "Récupération des nouveaux messages"
+msgstr "Récupération de %d messages"
 
 #: src/rpop3.c:993
-#, fuzzy, c-format
+#, c-format
 msgid "Opened message %d"
-msgstr "Envoyer le message"
+msgstr "Message ouverte %d"
 
 #: src/rpop3.c:1009
-#, fuzzy, c-format
+#, c-format
 msgid "Retrieved %d message headers"
-msgstr "Récupération des nouveaux messages"
+msgstr "Récupération de %d en-têtes de message"
 
 #: src/rpop3.c:1122
-#, fuzzy, c-format
+#, c-format
 msgid "Retrieving message %d ..."
-msgstr "Réception des messages de %s..."
+msgstr "Réception de messages %d ..."
 
 #: src/rpop3.c:1148
-#, fuzzy
 msgid "Delete messages"
-msgstr "Suppression de message(s)"
+msgstr "Suppression des messages"
 
 #: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
 msgstr ""
+"Vraiment supprimer les messages sélectionnés du serveur ?\n"
+"Cette opération est irréversible."
 
 #: src/select-keys.c:96
 #, c-format
@@ -6610,7 +6602,7 @@ msgstr "Envoi du message (%d / %d octets)"
 #: src/send_message.c:863
 #, c-format
 msgid "%d / %d bytes"
-msgstr ""
+msgstr "%d / %d bytes"
 
 #: src/send_message.c:892
 msgid "Sending message"
@@ -6769,7 +6761,7 @@ msgstr ""
 "  Sujet : %s\n"
 "  Délivré par : %s\n"
 "\n"
-"Accepter ce certificat?"
+"Accepter ce certificat ?"
 
 #: src/sslmanager.c:142 src/sslmanager.c:150
 msgid "_Reject"
@@ -7120,9 +7112,8 @@ msgid "Destination is same as current folder."
 msgstr "La destination est identique au dossier actuel."
 
 #: src/summaryview.c:3427
-#, fuzzy
 msgid "Select folder to move"
-msgstr "Choix d'un dossier"
+msgstr "Choisir le dossier à déplacer"
 
 #: src/summaryview.c:3457
 #, c-format
@@ -7134,9 +7125,8 @@ msgid "Destination for copy is same as current folder."
 msgstr "La destination et la source de la copie sont identiques."
 
 #: src/summaryview.c:3524
-#, fuzzy
 msgid "Select folder to copy"
-msgstr "Choix d'un dossier"
+msgstr "Choisir le dossier à copier"
 
 #: src/summaryview.c:3669
 msgid "Error occurred while processing messages."
diff --git a/po/gl.po b/po/gl.po
index 4ccbfdbd..8e71cf15 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -216,34 +216,34 @@ msgstr "iconv non pode convertir UTF-7 a %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non pode convertir %s a UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "non se pode escribir o ficheiro temporal\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "non podo ler o ficheiro mbox.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "formato de mbox inválido: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "mbox malformada: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "non se pode abrir o ficheiro temporal\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -252,43 +252,43 @@ msgstr ""
 "Atopado Dende sin escapar:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "non se pode crear o ficheiro de bloqueo %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "usar 'flock' en vez de 'file' si é posible.\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "non podo crear %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 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:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "non se pode bloquear %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "tipo de bloqueo non válido\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "non se pode desbloquear %s\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "non se pode truncar a cero a caixa de correo.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportando mensaxes de %s a %s...\n"
@@ -510,7 +510,7 @@ msgstr "Carpeta"
 msgid "Junk mail filter"
 msgstr "Carpeta"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Conversión de códigos fallida.\n"
 
@@ -1223,7 +1223,7 @@ msgstr "Notificación"
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Erro"
 
@@ -2748,159 +2748,159 @@ msgstr "Importar ficheiro LDIF na axenda"
 msgid "Attributes"
 msgstr "Atributos"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Finalizado (%d mensaxe(s) novo(s))"
 
-#: src/inc.c:479
+#: src/inc.c:477
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autenticando"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Obtendo novos mensaxes"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Feito (%d mensaxe(s) (%s) recibido(s))"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Non hai mensaxes novas."
 
-#: src/inc.c:710
+#: src/inc.c:708
 #, fuzzy
 msgid "Done"
 msgstr "Feito."
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Conexión fallida"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Autorización fallida"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:732
+#: src/inc.c:730
 #, fuzzy
 msgid "Timeout"
 msgstr "Tiempo límite (seg.)"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finalizado (%d mensaxe(s) novo(s))"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Finalizado (non hai mensaxes novos)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Ocurriu algún erro obtendo o correo."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obtendo novas mensaxes da conta %s...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autenticando"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando novas mensaxes"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando ó servidor POP3: %s ..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, 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:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtendo o número de novas mensaxes (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtendo o número de novas mensaxes (STAT)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtendo o número de novas mensaxes (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o tamaño de novas mensaxes (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Borrando mensaxe %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Saíndo"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaxe (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 #, fuzzy
 msgid "Connection failed."
 msgstr "Conexión fallida"
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "Ocurriu un erro mentras se procesaba o correo."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2909,29 +2909,29 @@ msgstr ""
 "Ocurriu un erro mentras se procesaba o correo:\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Non hai espacio libre no disco."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Non se pode escribir o ficheiro."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Error de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "a caixa de correo esta bloqueada."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2940,12 +2940,12 @@ msgstr ""
 "a caixa de correo esta bloqueada:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Fallo de autenticación"
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2954,15 +2954,15 @@ msgstr ""
 "Fallo de autenticación:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obtendo novos mensaxes dende %s en %s...\n"
diff --git a/po/hr.po b/po/hr.po
index 5829c30c..1d88442a 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+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"
@@ -218,34 +218,34 @@ msgstr ""
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "ne mogu pisati u privremenu datoteku\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "ne mogu čitati mbox datoteku.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "pogrešan mbox format: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "pokvaren mbox: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "ne mogu otvoriti privremenu datoteku\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -254,43 +254,43 @@ msgstr ""
 "neizbježan Od pronađen:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "ne mogu kreirati lock datoteku %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "koristi 'flock' umjesto 'file' ako je moguće.\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "ne mogu kreirati %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "neki drugi proces koristi sandučić, čekam...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "ne mogu zaključati %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "neispravan tip zaključavanja\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "ne mogu otključati %s\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "ne mogu skratiti sandučić na nulu.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Izvozim poruke iz %s u %s...\n"
@@ -516,7 +516,7 @@ msgstr "Spis"
 msgid "Junk mail filter"
 msgstr "Spis"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Promjena koda nije uspjela.\n"
 
@@ -1221,7 +1221,7 @@ msgstr "Obavijest"
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Greška"
 
@@ -2774,219 +2774,219 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Attributes"
 msgstr "Atributi korisnika"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "\t%d novih poruka\n"
 
-#: src/inc.c:479
+#: src/inc.c:477
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autorizacija"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Primam nove poruke"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "Standby"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Primam"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Ukloni poruke sa poslužitelja nakon primanja"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Nema nepročitanih poruka."
 
-#: src/inc.c:710
+#: src/inc.c:708
 msgid "Done"
 msgstr "Gotovo"
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Veza nije uspjela"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Identifikacija nije uspjela"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:732
+#: src/inc.c:730
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, fuzzy, c-format
 msgid "Finished (%d new message(s))"
 msgstr "\t%d novih poruka\n"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, fuzzy, c-format
 msgid "Finished (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:794
+#: src/inc.c:792
 #, fuzzy
 msgid "Some errors occurred while getting mail."
 msgstr "Došlo je do grešaka prilikom primanja pošte."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "primam nove poruke s računa %s...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autorizacija"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Primam nove poruke"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se na POP3 poslužitelj: %s ..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, 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:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Primam broj novih poruka (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Primam broj novih poruka (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Primam broj novih poruka (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Primam veličinu poruka (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, fuzzy, c-format
 msgid "Deleting message %d"
 msgstr "Brišem poruke"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Izlazim"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 #, fuzzy
 msgid "Connection failed."
 msgstr "Veza nije uspjela"
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, 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:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Nema više mjesta na disku."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 #, fuzzy
 msgid "Can't write file."
 msgstr "Ne mogu pisati u datoteku.\n"
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 #, fuzzy
 msgid "Socket error."
 msgstr "protokol greška\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "Postavke sandučića"
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Postavke sandučića"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autorizacija"
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autorizacija"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 #, fuzzy
 msgid "Incorporation cancelled\n"
 msgstr "Prima novu poštu"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Primam nove poruke s %s u %s...\n"
diff --git a/po/hu.po b/po/hu.po
index 1564dd28..28dfdf23 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,10 +5,10 @@
 # Németh Tamás <ntomasz@vipmail.hu>, 2005, 2006, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: Sylpheed-2.5\n"
+"Project-Id-Version: Sylpheed-2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 11:36+0900\n"
-"PO-Revision-Date: 2008-05-25 20:14+0200\n"
+"POT-Creation-Date: 2008-12-15 17:55+0900\n"
+"PO-Revision-Date: 2008-12-01 19:42+0100\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: HUNGARIAN <NONE>\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 
 #: libsylph/account.c:56
 msgid "Reading all config for each account...\n"
-msgstr "Beállítások beolvasása az összes hozzáféréshez...\n"
+msgstr "Beállítások beolvasása az összes fiókhoz...\n"
 
 #: libsylph/imap.c:482
 #, c-format
@@ -211,34 +211,34 @@ msgstr "az iconv nem tud UTF-7-ből konvertálni ebbe: %s\n"
 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:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "nem lehet az ideiglenes fájlba írni\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Levelek fogadása innen: %s ide: %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "az mbox fájlt nem lehet olvasni.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "érvénytelen mbox formátum: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "sérült mbox: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "nem lehet ideiglenes fájlt megnyitni\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -247,43 +247,43 @@ msgstr ""
 "kódolatlan Feladó található:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "%s zároló fájlt nem lehet létrehozni\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "'flock' használata 'file' helyett, ha lehet.\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "%s nem hozható létre\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 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:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "%s nem zárolható\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "érvénytelen zároló típus\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "%s zárolása nem oldható fel\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
-msgstr "nem lehet nulla méretűre változtatni a postafiókot.\n"
+msgstr "nem lehet nulla méretűre változtatni a postaládát.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Levelek exportálása innen: %s ide: %s...\n"
@@ -463,7 +463,7 @@ msgstr "POP3: %d levél átugrása (%d bájt)\n"
 
 #: libsylph/pop.c:689
 msgid "mailbox is locked\n"
-msgstr "a postafiók zárolt\n"
+msgstr "a postaláda zárolt\n"
 
 #: libsylph/pop.c:692
 msgid "session timeout\n"
@@ -508,7 +508,7 @@ msgstr "Levélszemét szűrés (kézi)"
 msgid "Junk mail filter"
 msgstr "Levélszemét szűrés"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Kód konverziós hiba.\n"
 
@@ -656,19 +656,19 @@ msgid ""
 "Please close all the composing windows before editing the accounts."
 msgstr ""
 "Néhány szerkesztő ablak nyitva van.\n"
-"Zárjon be minden szerkesztő ablakot a hozzáférések módosítása előtt."
+"Zárjon be minden szerkesztő ablakot a fiókok módosítása előtt."
 
 #: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
-msgstr "Hozzáférések szerkesztőablakának megnyitása...\n"
+msgstr "Fiókok szerkesztőablakának megnyitása...\n"
 
 #: src/account_dialog.c:288
 msgid "Creating account edit window...\n"
-msgstr "Hozzáférések szerkesztőablakának létrehozása...\n"
+msgstr "Fiókok szerkesztőablakának létrehozása...\n"
 
 #: src/account_dialog.c:293
 msgid "Edit accounts"
-msgstr "Hozzáférések szerkesztése"
+msgstr "Fiókok szerkesztése"
 
 #: src/account_dialog.c:313
 msgid ""
@@ -706,7 +706,7 @@ msgstr " Alapértelmezett hozzá_férésként beállít "
 #: src/account_dialog.c:489
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
-msgstr "Tényleg törölni szeretné  a(z) '%s' hozzáférést?"
+msgstr "Tényleg törölni szeretné '%s' fiókot?"
 
 #: src/account_dialog.c:491 src/prefs_filter.c:687
 msgid "(Untitled)"
@@ -714,7 +714,7 @@ msgstr "(Névtelen)"
 
 #: src/account_dialog.c:492
 msgid "Delete account"
-msgstr "Hozzáférés törlése"
+msgstr "Fiók törlése"
 
 #: src/action.c:331
 #, c-format
@@ -1208,7 +1208,7 @@ msgstr "Megjegyzés"
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Hiba"
 
@@ -1641,13 +1641,13 @@ msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgstr ""
-"Nincs megadva hozzáférés a levél küldéshez.\n"
-"Válasszon ki egy hozzáférést küldés előtt!"
+"Nincs megadva fiók a levél küldéshez.\n"
+"Válasszon ki egy fiókot küldés előtt!"
 
 #: src/compose.c:3332 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
-msgstr "Hiba lépett fel a %s-nak/nek küldendő levél küldésekor."
+msgstr "Hiba lépett fel %s-n{ae}k küldendő levél küldésekor."
 
 #: src/compose.c:3382
 msgid "Can't save the message to outbox."
@@ -1657,7 +1657,8 @@ msgstr "A levél nem menthető a kimenő mappába."
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
-"Nem találtam hozzárendelt kulcsot a kiválasztott kulcs azonosítóhoz `%s'."
+"Nem található hozzárendelt kulcs ehhez a kiválasztott kulcs azonosítóhoz: `%"
+"s'."
 
 #: src/compose.c:3447 src/compose.c:3832
 msgid "Can't sign the message."
@@ -1682,7 +1683,7 @@ msgid ""
 "\n"
 "Send it as %s anyway?"
 msgstr ""
-"Nem lehet konvertálni a levél karakterkódolását %s-ról/ről %s-ra.\n"
+"Nem lehet konvertálni a levél karakterkódolását %s-r{óő}l %s-r{ae}.\n"
 "\n"
 "Ennek ellenére elküldi, mint %s?"
 
@@ -2452,16 +2453,16 @@ msgstr "Postaláda eltávolítása"
 #: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
-msgstr "Tényleg törli a(z) `%s' IMAP4 hozzáférést?"
+msgstr "Tényleg törli `%s' IMAP4 fiókot?"
 
 #: src/folderview.c:2657
 msgid "Delete IMAP4 account"
-msgstr "IMAP4 hozzáférés törlése"
+msgstr "IMAP4 fiók törlése"
 
 #: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
-msgstr "Tényleg törli a(z) `%s' hírcsoportot?"
+msgstr "Tényleg törli `%s' hírcsoportot?"
 
 #: src/folderview.c:2811
 msgid "Delete newsgroup"
@@ -2470,11 +2471,11 @@ msgstr "Hírcsoport törlése"
 #: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
-msgstr "Tényleg törli a(z) `%s' hírhozzáférést?"
+msgstr "Tényleg törli `%s' hírfiókot?"
 
 #: src/folderview.c:2862
 msgid "Delete news account"
-msgstr "Hírhozzáférés törlése"
+msgstr "Hírfiók törlése"
 
 #: src/headerview.c:57
 msgid "Newsgroups:"
@@ -2555,11 +2556,11 @@ msgstr "Fájlnév"
 
 #: src/importcsv.c:700
 msgid "Comma-separated"
-msgstr "Vessző-elválasztó"
+msgstr "Vesszővel elválasztott"
 
 #: src/importcsv.c:704
 msgid "Tab-separated"
-msgstr "Tab-elválasztó"
+msgstr "Tabbal elválasztott"
 
 #: src/importcsv.c:735 src/importldif.c:530
 msgid "S"
@@ -2666,142 +2667,141 @@ msgstr "LDIF fájl importálása a címjegyzékbe"
 msgid "Attributes"
 msgstr "Tulajdonságok"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d új levél"
 
-#: src/inc.c:479
+#: src/inc.c:477
 msgid "Authenticating with POP3"
 msgstr "POP3 azonosítás"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Új levelek fogadása"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "Készenlét"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Megszakítva"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Fogadás"
 
-#: src/inc.c:705 src/inc.c:1015
-#, fuzzy, c-format
+#: src/inc.c:703 src/inc.c:1013
+#, c-format
 msgid "%d message(s) (%s) received"
-msgstr "Kész (%d levél (%s) fogadott)"
+msgstr "%d levél (%s) fogadva"
 
-#: src/inc.c:709
-#, fuzzy, c-format
+#: src/inc.c:707
+#, c-format
 msgid "no new messages"
-msgstr "Nincs új levél."
+msgstr "nincs új levél."
 
-#: src/inc.c:710
-#, fuzzy
+#: src/inc.c:708
 msgid "Done"
-msgstr "Kész."
+msgstr "Kész"
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Kapcsolat megszakadt"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Azonosítás nem sikerült"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Zárolt"
 
-#: src/inc.c:732
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Időtúllépés"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
-msgstr "Vége (%d új levél)"
+msgstr "Befejezve (%d új levél)"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
-msgstr "Vége (nincs új levél)"
+msgstr "Befejezve (nincs új levél)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Hiba történt a levelek fogadásakor."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
-msgstr "%s hozzáférésről az új levelek letöltése...\n"
+msgstr "új levelek letöltése %s fióknál...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: POP3 azonosítás"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Új levelek fogadása"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Kapcsolódás a(z) %s POP3 szerverhez ..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, 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:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Azonosítás..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Levelek fogadása innen: %s ..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Új levelek számának megszerzése (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Új levelek számának megszerzése (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Új levelek számának megszerzése (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Új levelek méretének megszerzése (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d levél törlése"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Kilépés"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Levél letöltése (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2809,15 +2809,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:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "Kapcsolat megszakadt."
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "Hiba a levelek feldolgozása közben."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2826,42 +2826,42 @@ msgstr ""
 "Hiba a levelek feldolgozása közben:\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Nincs több szabad hely a lemezen."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Nem lehet a fájlba írni."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Socket hiba."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "A távoli fél bezárta a kapcsolatot."
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
-msgstr "A postafiók zárolt."
+msgstr "A postaláda zárolt."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr ""
-"A postafiók zárolt:\n"
+"A postaláda zárolt:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Az azonosítás nem sikerült."
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2870,15 +2870,15 @@ msgstr ""
 "Az azonosítás nem sikerült:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Menet időtúllépése."
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Fogadás megszakítva\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s új leveleinek letöltése a(z) %s mappába...\n"
@@ -2925,7 +2925,7 @@ msgstr "  --receive              új levelek letöltése"
 
 #: src/main.c:526
 msgid "  --receive-all          receive new messages of all accounts"
-msgstr "  --receive-all          új levelek letöltése minden hozzáférésről"
+msgstr "  --receive-all          új levelek letöltése minden fióknál"
 
 #: src/main.c:527
 msgid "  --send                 send all queued messages"
@@ -3029,7 +3029,7 @@ msgstr ""
 #. remote command mode
 #: src/main.c:1135
 msgid "another Sylpheed is already running.\n"
-msgstr "Egy másik Sylpheed már fut.\n"
+msgstr "egy másik Sylpheed már fut.\n"
 
 #: src/main.c:1405
 msgid "Migration of configuration"
@@ -3403,20 +3403,19 @@ msgstr "/_Levél/Fog_adás"
 
 #: src/mainwindow.c:770
 msgid "/_Message/Recei_ve/Get from _current account"
-msgstr "/_Levél/Fog_adás/_Aktuális hozzáférésről"
+msgstr "/_Levél/Fog_adás/_Aktuális fióknál"
 
 #: src/mainwindow.c:772
 msgid "/_Message/Recei_ve/Get from _all accounts"
-msgstr "/_Levél/Fog_adás/_Minden hozzáférésről"
+msgstr "/_Levél/Fog_adás/_Minden fióknál"
 
 #: src/mainwindow.c:774
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Levél/Fo_gadás/Fogadás leá_llítása"
 
 #: src/mainwindow.c:776
-#, fuzzy
 msgid "/_Message/Recei_ve/_Remote mailbox..."
-msgstr "/_Levél/Fog_adás/_Minden hozzáférésről"
+msgstr "/_Levél/Fog_adás/_Távoli postaláda"
 
 #: src/mainwindow.c:778
 msgid "/_Message/Recei_ve/---"
@@ -3603,19 +3602,19 @@ msgstr "/_Beállítások/---"
 
 #: src/mainwindow.c:861
 msgid "/_Configuration/_Preferences for current account..."
-msgstr "/_Beállítások/Aktuális _hozzáférés beállításai..."
+msgstr "/_Beállítások/Aktuális _fiók beállításai..."
 
 #: src/mainwindow.c:863
 msgid "/_Configuration/Create _new account..."
-msgstr "/_Beállítások/Ú_j hozzáférés létrehozása..."
+msgstr "/_Beállítások/Ú_j fiók létrehozása..."
 
 #: src/mainwindow.c:865
 msgid "/_Configuration/_Edit accounts..."
-msgstr "/_Beállítások/Hozzáférések _szerkesztése..."
+msgstr "/_Beállítások/Fiókok _szerkesztése..."
 
 #: src/mainwindow.c:867
 msgid "/_Configuration/C_hange current account"
-msgstr "/_Beállítások/_Aktuális hozzáférés váltása..."
+msgstr "/_Beállítások/_Aktuális fiók váltása..."
 
 #: src/mainwindow.c:871
 msgid "/_Help/_Manual"
@@ -3805,9 +3804,8 @@ msgid "Exit this program?"
 msgstr "Kilépés a programból?"
 
 #: src/mainwindow.c:3793
-#, fuzzy
 msgid "Select folder to open"
-msgstr "Mappa választása"
+msgstr "Megnyitandó mappa kiválasztása"
 
 #: src/mainwindow.c:3943
 msgid "Command line options"
@@ -3866,7 +3864,7 @@ msgstr ""
 "emailszerkesztő ablak megnyitása\n"
 "emailszerkesztő ablak megnyitása a megadott csatolmányokkal\n"
 "új levelek ellenőrzése\n"
-"új levelek ellenőrzése az összes hozzáférésen\n"
+"új levelek ellenőrzése az összes fióknál\n"
 "összes eltárolt levél elküldése\n"
 "megjeleníti a mappa leveleinek számát\n"
 "megjeleníti minden egyes mappa leveleinek számát\n"
@@ -4089,24 +4087,24 @@ msgstr ""
 
 #: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
-msgstr "Hozzáférés beállítások ablak megnyitása...\n"
+msgstr "Fiók beállítások ablak megnyitása...\n"
 
 #: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
-msgstr "Hozzáférés%d"
+msgstr "Fiók%d"
 
 #: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
-msgstr "Új hozzáférés beállításai"
+msgstr "Új fiók beállításai"
 
 #: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:99
 msgid "Account preferences"
-msgstr "Hozzáférés beállítások"
+msgstr "Fiók beállítások"
 
 #: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
-msgstr "Hozzáférésbeállítások ablak létrehozása...\n"
+msgstr "Fiók beállítások ablak létrehozása...\n"
 
 #: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:703
 msgid "Receive"
@@ -4136,7 +4134,7 @@ msgstr "Haladó"
 
 #: src/prefs_account_dialog.c:624
 msgid "Name of this account"
-msgstr "Hozzáférés neve"
+msgstr "Fiók neve"
 
 #: src/prefs_account_dialog.c:633
 msgid "Set as default"
@@ -4243,7 +4241,7 @@ msgstr "Levelek szűrése fogadás közben"
 
 #: src/prefs_account_dialog.c:946
 msgid "Default inbox"
-msgstr "Alapértelmezett bejövő postafiók"
+msgstr "Alapértelmezett bejövő mappa"
 
 #: src/prefs_account_dialog.c:966
 msgid "Unfiltered messages will be stored in this folder."
@@ -4280,7 +4278,7 @@ msgstr "Ha 0 van megadva, akkor korlátlan."
 
 #: src/prefs_account_dialog.c:1034
 msgid "`Get all' checks for new messages on this account"
-msgstr "`Fogadás mindről' ellenőrizze ezt a hozzáférést is"
+msgstr "`Fogadás mindről' ellenőrizze ezt a fiókot is"
 
 #: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
@@ -4485,7 +4483,7 @@ msgstr "Törölt levelek elhelyezése"
 
 #: src/prefs_account_dialog.c:1951
 msgid "Account name is not entered."
-msgstr "Hozzáférés neve nincs megadva."
+msgstr "A fiók neve nincs megadva."
 
 #: src/prefs_account_dialog.c:1955
 msgid "Mail address is not entered."
@@ -4621,7 +4619,7 @@ msgid ""
 "%s\n"
 "has a syntax error."
 msgstr ""
-"A%s\n"
+"A %s\n"
 "parancs\n"
 "szintaktikai hibát tartalmaz."
 
@@ -4685,7 +4683,7 @@ msgstr "Parancs"
 #: src/prefs_common_dialog.c:824
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
-msgstr "A `%d' helyére az új levelek száma kerül."
+msgstr "`%d' helyére az új levelek száma kerül."
 
 #: src/prefs_common_dialog.c:828
 msgid "Incorporate from local spool"
@@ -4777,7 +4775,7 @@ msgstr "Válasz"
 
 #: src/prefs_common_dialog.c:1114
 msgid "Automatically select account for replies"
-msgstr "Automatikus hozzáférés választás válaszkor"
+msgstr "Automatikus fiók választás válaszkor"
 
 #: src/prefs_common_dialog.c:1116
 msgid "Quote message when replying"
@@ -5481,7 +5479,7 @@ msgstr "Idézett szöveg - harmadik szint"
 
 #: src/prefs_common_dialog.c:3098
 msgid "URI link"
-msgstr "URI-kapocs"
+msgstr "URI hivatkozás"
 
 #: src/prefs_common_dialog.c:3105
 msgid "Recycle quote colors"
@@ -5898,7 +5896,7 @@ msgstr "Válasz esetén törölje a [...] vagy (...) szöveget a tárgy mezőbő
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
 #: src/prefs_toolbar.c:98 src/progressdialog.c:129
 msgid "Account"
-msgstr "Hozzáférés"
+msgstr "Fiók"
 
 #: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
@@ -5963,7 +5961,7 @@ msgstr "Dátum"
 #. S_COL_SIZE
 #: src/prefs_summary_column.c:73
 msgid "Number"
-msgstr "Szám"
+msgstr "Sorszám"
 
 #. S_COL_NUMBER
 #: src/prefs_summary_column.c:74 src/summaryview.c:5095
@@ -6044,17 +6042,15 @@ msgstr "Fogadás mindről"
 
 #: src/prefs_toolbar.c:45
 msgid "Incorporate new mail of all accounts"
-msgstr "Új levelek fogadása minden hozzáférésen"
+msgstr "Új levelek fogadása minden fióknál"
 
 #: src/prefs_toolbar.c:47
-#, fuzzy
 msgid "Remote mailbox"
-msgstr "Postaláda eltávolítása"
+msgstr "Távoli postaláda"
 
 #: src/prefs_toolbar.c:48
-#, fuzzy
 msgid "POP3 Remote mailbox"
-msgstr "Postaláda eltávolítása"
+msgstr "POP3 Távoli postaláda"
 
 #: src/prefs_toolbar.c:51
 msgid "Send queued message(s)"
@@ -6234,9 +6230,8 @@ msgid "Status"
 msgstr "Állapot"
 
 #: src/progressdialog.c:145
-#, fuzzy
 msgid "Progress"
-msgstr "Tulajdonságok"
+msgstr "Folyamat"
 
 #: src/query_search.c:425
 msgid "_Save as search folder"
@@ -6330,75 +6325,70 @@ msgid "Error verifying the signature"
 msgstr "Hiba az aláírás ellenőrzése közben"
 
 #: src/rpop3.c:242
-#, fuzzy
 msgid "_File"
-msgstr "/_Fájl"
+msgstr "_Fájl"
 
 #: src/rpop3.c:243 src/rpop3.c:436
-#, fuzzy
 msgid "_Get"
-msgstr "Fogadás"
+msgstr "Fo_gadás"
 
 #: src/rpop3.c:248
-#, fuzzy
 msgid "_Help"
-msgstr "/_Súgó"
+msgstr "_Súgó"
 
 #: src/rpop3.c:249
-#, fuzzy
 msgid "_About"
-msgstr "Névjegy"
+msgstr "_Névjegy"
 
 #: src/rpop3.c:338
-#, fuzzy, c-format
+#, c-format
 msgid "%s - POP3 Remote mailbox"
-msgstr "Postaláda eltávolítása"
+msgstr "%s - POP3 Távoli postaláda"
 
 #: src/rpop3.c:414 src/summaryview.c:5093
 msgid "No."
-msgstr "Db"
+msgstr "Ssz."
 
 #: src/rpop3.c:497
-#, fuzzy, c-format
+#, c-format
 msgid "Connecting to %s:%d ..."
-msgstr "Kapcsolódás %s SMTP szerverhez..."
+msgstr "Kapcsolódás %s:%d szerverhez..."
 
 #: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
-#, fuzzy, c-format
+#, c-format
 msgid "Can't connect to POP3 server: %s:%d"
-msgstr "Nem sikerült kapcsolódni a POP3 szerverhez: %s:%d\n"
+msgstr "Nem sikerült kapcsolódni a POP3 szerverhez: %s:%d"
 
 #: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
-#, fuzzy
 msgid "Error occurred during POP3 session."
-msgstr "hiba történt a POP3 kapcsolat közben\n"
+msgstr "Hiba történt a POP3-as munkamenet közben."
 
 #: src/rpop3.c:533
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
-msgstr "hiba történt a POP3 kapcsolat közben\n"
+msgstr ""
+"Hiba történt a POP3-as munkamenet közben:\n"
+"%s"
 
 #: src/rpop3.c:686
-#, fuzzy, c-format
+#, c-format
 msgid "Retrieving message headers (%d / %d) ..."
-msgstr "Levélfejlécek letöltése (%d / %d)"
+msgstr "Levélfejlécek letöltése (%d / %d) ..."
 
 #: src/rpop3.c:846
-#, fuzzy
 msgid "Getting the number of messages..."
-msgstr "Új levelek számának megszerzése (STAT)..."
+msgstr "Új levelek számának megszerzése..."
 
 #: src/rpop3.c:855 src/rpop3.c:868
-#, fuzzy
 msgid "No message"
-msgstr "Nincs új levél."
+msgstr "Nincs levél"
 
 #: src/rpop3.c:901
-#, fuzzy, c-format
+#, c-format
 msgid "Deleted %d messages"
-msgstr "Levél(ek) törlése"
+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
@@ -6407,35 +6397,36 @@ msgid "Quitting..."
 msgstr "Kilépés..."
 
 #: src/rpop3.c:986
-#, fuzzy, c-format
+#, c-format
 msgid "Retrieved %d messages"
-msgstr "Új levelek fogadása"
+msgstr "%d levél fogadva"
 
 #: src/rpop3.c:993
-#, fuzzy, c-format
+#, c-format
 msgid "Opened message %d"
-msgstr "Levél küldése"
+msgstr "%d levél megnyitva"
 
 #: src/rpop3.c:1009
-#, fuzzy, c-format
+#, c-format
 msgid "Retrieved %d message headers"
-msgstr "Új levelek fogadása"
+msgstr "%d levélfejléc fogadva"
 
 #: src/rpop3.c:1122
-#, fuzzy, c-format
+#, c-format
 msgid "Retrieving message %d ..."
-msgstr "Levelek fogadása innen: %s ..."
+msgstr "%d levél fogadása ..."
 
 #: src/rpop3.c:1148
-#, fuzzy
 msgid "Delete messages"
-msgstr "Levél(ek) törlése"
+msgstr "Levelek törlése"
 
 #: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
 msgstr ""
+"Tényleg törli a szerverről a kiválasztott leveleket?\n"
+"Ezt a műveletet nem lehet visszavonni."
 
 #: src/select-keys.c:96
 #, c-format
@@ -6561,7 +6552,7 @@ msgstr "Levél küldése (%d / %d bájt)"
 #: src/send_message.c:863
 #, c-format
 msgid "%d / %d bytes"
-msgstr ""
+msgstr "%d / %d bájt"
 
 #: src/send_message.c:892
 msgid "Sending message"
@@ -7066,9 +7057,8 @@ msgid "Destination is same as current folder."
 msgstr "A cél azonos az aktuális mappával."
 
 #: src/summaryview.c:3427
-#, fuzzy
 msgid "Select folder to move"
-msgstr "Mappa választása"
+msgstr "Áthelyezendő mappa kiválasztása"
 
 #: src/summaryview.c:3457
 #, c-format
@@ -7080,9 +7070,8 @@ 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
-#, fuzzy
 msgid "Select folder to copy"
-msgstr "Mappa választása"
+msgstr "Másolandó mappa kiválasztása"
 
 #: src/summaryview.c:3669
 msgid "Error occurred while processing messages."
@@ -7185,11 +7174,11 @@ msgstr "Sylpheed _megjelenítése"
 
 #: src/trayicon.c:144
 msgid "Get from _current account"
-msgstr "Fogadás az _aktuális hozzáférésről"
+msgstr "Fogadás az _aktuális fióknál"
 
 #: src/trayicon.c:148
 msgid "Get from _all accounts"
-msgstr "Fogadás _minden hozzáférésről"
+msgstr "Fogadás _minden fióknál"
 
 #: src/trayicon.c:152
 msgid "_Send queued messages"
@@ -7202,12 +7191,3 @@ msgstr "_Kilépés"
 #: src/trayicon.c:198 src/trayicon.c:287
 msgid "Sylpheed"
 msgstr "Sylpheed"
-
-#~ msgid "%d messages found.\n"
-#~ msgstr "%d levél található.\n"
-
-#~ msgid "Done (no new messages)"
-#~ msgstr "Kész (nincs új levél)"
-
-#~ msgid "Retrieving (%d message(s) (%s) received)"
-#~ msgstr "Levelek fogadása (%d levél (%s) fogadott)"
diff --git a/po/it.po b/po/it.po
index 5581d2ce..2cac3854 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+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"
@@ -211,34 +211,34 @@ msgstr "iconv non può convertire UTF-7 in %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non può convertire %s in UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "impossibile scrivere sul file temporaneo\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Ricezione in %s dei messaggi da %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "impossibile leggere il file mbox.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "formato mbox non valido: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "mbox non valida: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "impossibile aprire il file temporaneo\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -247,43 +247,43 @@ msgstr ""
 "trovato un Da senza la sequenza di escape:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "impossibile creare il file di lock %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "se possibile usare «flock» al posto di «file».\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "impossibile creare %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "la casella postale è occupata da un altro processo, attendo...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "impossibile effettuare il lock %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "tipo di lock non valido\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "impossibile liberare il lock su %s\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "impossibile troncare a zero la casella postale.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Esportazione dei messaggi da %s in %s...\n"
@@ -508,7 +508,7 @@ msgstr "Filtro mail spazzatura (manuale)"
 msgid "Junk mail filter"
 msgstr "Filtro mail spazzatura"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Conversione del codice fallita.\n"
 
@@ -1211,7 +1211,7 @@ msgstr "Avviso"
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Errore"
 
@@ -2680,142 +2680,142 @@ msgstr "Importazione del file LDIF nella rubrica"
 msgid "Attributes"
 msgstr "Attibuti"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nuovi messaggi"
 
-#: src/inc.c:479
+#: src/inc.c:477
 msgid "Authenticating with POP3"
 msgstr "Autenticazione con POP3"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Recupero i nuovi messaggi"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "Attesa"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Cancellato"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Recupero"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Fatto (ricevuti %d messaggio(i) (%s))"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Non esistono messaggi nuovi."
 
-#: src/inc.c:710
+#: src/inc.c:708
 #, fuzzy
 msgid "Done"
 msgstr "Fatto."
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Connessione fallita"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Autenticazione fallita"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Bloccato"
 
-#: src/inc.c:732
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Timeout"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finito (%d nuovo(i) messaggio(i))"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Finito (non ci sono nuovi messaggi)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Ci sono stati degli errori durante la ricezione della posta."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "ricezione dei nuovi messaggi dell'account %s...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: autenticazione con POP3"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recupero i nuovi messaggi"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Connessione al server POP3: %s..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossibile connettersi al server POP3: %s:%d\n"
 
-#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Autenticazione..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Ricezione dei messaggi da %s..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Ricezione del numero dei nuovi messaggi (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Ricezione del numero dei nuovi messaggi (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Ricezione del numero dei nuovi messaggi (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Ricezione della dimensione dei messaggi (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Eliminazione del messaggio %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Esco"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recupero il messaggio (%d di %d) (%s di %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2823,15 +2823,15 @@ msgstr ""
 "L'esecuzione del comando del filtro spazzatura è fallita.\n"
 "Controllare l'impostazione del controllo della mail spazzatura."
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "Connessione fallita."
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "Si è verificato un errore durante l'elaborazione della posta."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2840,29 +2840,29 @@ msgstr ""
 "Si è verificato un errore durante l'elaborazione della posta:\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Spazio su disco esaurito."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Impossibile scrivere il file."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Errore del socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "Connessione chiusa dall'host remoto."
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "La casella postale è bloccata."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2871,11 +2871,11 @@ msgstr ""
 "La casella postale è bloccata:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Autenticazione fallita."
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2884,15 +2884,15 @@ msgstr ""
 "Autenticazione fallita:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "La sessione è andata in timeout."
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Incorporazione cancellata\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Ricezione in %s dei nuovi messaggi da %s...\n"
diff --git a/po/ja.po b/po/ja.po
index 9a61d7d5..e19699af 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+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"
@@ -210,34 +210,34 @@ msgstr "iconv が UTF-7 を %s に変換できません\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv が %s を UTF-7 に変換できません\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "一時ファイルに書き込めません\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "メッセージを %s から %s に取り込んでいます...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "メールボックスファイルを読み込めません。\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "無効なメールボックスの形式: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "メールボックスが異常です: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "一時ファイルを開けません\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -246,43 +246,43 @@ msgstr ""
 "エスケープされていない From が見つかりました:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "ロックファイル %s を開けません\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "可能であれば 'file' の代わりに 'flock' を使用してください。\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "%s を作成できません。\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "メールボックスは別のプロセスによって所有されています。待機中...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "%s をロックできません\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "無効なロックタイプです\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "%s をロック解除できません\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "メールボックスをゼロに切り詰められません。\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "メッセージを %s から %s に書き出しています...\n"
@@ -507,7 +507,7 @@ msgstr "迷惑メールフィルタ (手動)"
 msgid "Junk mail filter"
 msgstr "迷惑メールフィルタ"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): コード変換に失敗しました。\n"
 
@@ -1206,7 +1206,7 @@ msgstr "注意"
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "エラー"
 
@@ -2662,141 +2662,141 @@ msgstr "LDIFファイルをアドレス帳へインポート"
 msgid "Attributes"
 msgstr "属性"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d 通の新着メッセージ"
 
-#: src/inc.c:479
+#: src/inc.c:477
 msgid "Authenticating with POP3"
 msgstr "POP3で認証中"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "新着メッセージを受信中"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "待機中"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "キャンセル"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "受信中"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, c-format
 msgid "%d message(s) (%s) received"
 msgstr "%d 通 (%s) 受信"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, c-format
 msgid "no new messages"
 msgstr "新着メッセージなし"
 
-#: src/inc.c:710
+#: src/inc.c:708
 msgid "Done"
 msgstr "完了"
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "接続失敗"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "認証失敗"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "ロック中"
 
-#: src/inc.c:732
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "タイムアウト"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完了 (%d 通の新着メッセージ)"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "完了 (新着メッセージなし)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "メールの取得中にエラーが発生しました。"
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "アカウント %s の新着メッセージを取り込んでいます...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: POP3で認証中"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 新着メッセージを受信中"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3サーバ: %s に接続中..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3サーバ: %s:%d に接続できません\n"
 
-#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "認証中..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s からメッセージを受信中..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "新着メッセージの数を取得中 (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "新着メッセージの数を取得中 (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "新着メッセージの数を取得中 (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "メッセージのサイズを取得中 (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "メッセージ %d を削除中"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "切断中"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "メッセージを受信中 (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2804,15 +2804,15 @@ msgstr ""
 "迷惑メールフィルタコマンドの実行に失敗しました。\n"
 "迷惑メール対策の設定を確認してください。"
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "接続に失敗しました。"
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "メールの処理中にエラーが発生しました。"
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2821,29 +2821,29 @@ msgstr ""
 "メールの処理中にエラーが発生しました:\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "ディスクの空き容量がありません。"
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "ファイルに書き込めません。"
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "ソケットエラーです。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "リモートホストによって接続を切断されました。"
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "メールボックスはロックされています。"
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2852,11 +2852,11 @@ msgstr ""
 "メールボックスはロックされています:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "認証に失敗しました。"
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2865,15 +2865,15 @@ msgstr ""
 "認証に失敗しました:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "セッションがタイムアウトしました。"
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "受信をキャンセルしました\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "新しいメッセージを %s から %s に取り込んでいます...\n"
diff --git a/po/ko.po b/po/ko.po
index 33db6fb0..15be27e7 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+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"
@@ -217,34 +217,34 @@ msgstr "iconv가 UTF-7를 %s로 변환할 수 없습니다\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv가 %s를 UTF-7로 변환할 수 없습니다\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "임시 파일에 쓸 수가 없습니다\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "mbox 파일을 읽을 수가 없습니다.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "올바르지않은 mbox 포멧: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "제대로되어있지않은 mbox: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "임시파일을 열 수가 없습니다\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -253,43 +253,43 @@ msgstr ""
 "메시지 본문중 From으로 시작하는 줄이 있습니다:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "잠금 파일 %s을 만들수가 없습니다\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "가능하면 'file'대신에 'flock'를 사용하세요.\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "%s를 생성할 수가 없습니다\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "메일박스를 다른 프로세스가 읽고있습니다. 잠시 기다리세요...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "%s에 lock를 걸수가 없습니다\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "올바르지않은 잠금 타입\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "%s에 lock를 풀 수가 없습니다\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "메일박스의 크기를 0으로 만들수가 없습니다.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "메시지를 %s에서 %s로 보냅니다...\n"
@@ -513,7 +513,7 @@ msgstr "폴더"
 msgid "Junk mail filter"
 msgstr "폴더"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): 코드 변환이 실패했습니다.\n"
 
@@ -1207,7 +1207,7 @@ msgstr "알림"
 msgid "Warning"
 msgstr "경고"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "에러"
 
@@ -2731,214 +2731,214 @@ msgstr "LDIF 파일을 주소록으로 가져오기"
 msgid "Attributes"
 msgstr "속성"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "끝났습니다 (%d개의 새로운 메시지)"
 
-#: src/inc.c:479
+#: src/inc.c:477
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "인증"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "새 메시지를 가져옴"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr ""
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "취소되었습니다"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr ""
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "완료 (%d 메시지 (%s)가 받아짐)"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "새 메시지가 없습니다."
 
-#: src/inc.c:710
+#: src/inc.c:708
 #, fuzzy
 msgid "Done"
 msgstr "완료."
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "연결이 실패했습니다"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "인증이 실패했습니다."
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:732
+#: src/inc.c:730
 msgid "Timeout"
 msgstr ""
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "끝났습니다 (%d개의 새로운 메시지)"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "끝났습니다 (새 메시지 없음)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "편지를 받다가 에러가 발생했습니다."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s 계정으로부터 새 메시지를 얻습니다...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "인증"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 새 메시지를 가져옴"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3 서버 %s에 연결합니다..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "%s:%d POP3 서버에 연결할 수가 없습니다\n"
 
-#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "인증 중입니다..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "새 메시지의 갯수를 얻는 중 (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "새 메시지의 갯수를 얻는 중 (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "새 메시지의 갯수를 얻는 중 (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "메시지의 크기를 얻는 중 (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d 메시지를 삭제하는 중"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "끝마치는 중"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "메시지 (%d / %d) 를 가져오는 중 (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 #, fuzzy
 msgid "Connection failed."
 msgstr "연결이 실패했습니다"
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "디스크에 남은 공간이 없슴."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "파일에 쓸 수가 없습니다."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "소켓 에러."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "메일박스가 잠겨있습니다."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "메일박스가 잠겨있습니다."
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 #, fuzzy
 msgid "Authentication failed."
 msgstr "인증 방법"
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "인증 방법"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "병합이 취소되었습니다.\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s로부터 %s로 새 메시지를 가져옴...\n"
diff --git a/po/lt.po b/po/lt.po
index e9c76430..95845da1 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+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"
@@ -210,34 +210,34 @@ msgstr "iconv negali konvertuoti UTF-7 į %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv negali konvertuoti %s į UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "negaliu rašyti į laikinąjį failą\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Gaunami laiškai iš %s į %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "negaliu perskaityti „mbox“ failo.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "neteisingas „mbox“ formatas: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "pažeistas „mbox“ failas: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "negaliu atverti laikinojo failo\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -246,43 +246,43 @@ msgstr ""
 "unescaped From found:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "negaliu sukurti užrakto failo %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "naudokite „flock“ vietoj „file“ jei įmanoma.\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "negaliu sukurti %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "dėžutę turi kitas procesas, laukiu...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "negaliu užrakinti %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "blogas užrakto tipas\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "negaliu atrakinti %s\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "negaliu sumažinti dėžutės iki nulio.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Eksportuojami laiškai iš %s į %s...\n"
@@ -507,7 +507,7 @@ msgstr "Nepageidautino pašto filtras (neautomatinis)"
 msgid "Junk mail filter"
 msgstr "Nepageidautino pašto filtras"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Nepavyko konvertuoti kodo.\n"
 
@@ -1203,7 +1203,7 @@ msgstr "Pranešimas"
 msgid "Warning"
 msgstr "Įspėjimas"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Klaida"
 
@@ -2660,156 +2660,156 @@ msgstr "Importuoti LDIF failą į adresų knygą"
 msgid "Attributes"
 msgstr "Atributai"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nauji laiškai"
 
-#: src/inc.c:479
+#: src/inc.c:477
 msgid "Authenticating with POP3"
 msgstr "Tikrinamas autentiškumas (POP3)"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Gaunami nauji laiškai"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "Laukiama"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Nutraukta"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Gaunama"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Atlikta (gauta laiškų: %d (%s))"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Nėra naujų laiškų."
 
-#: src/inc.c:710
+#: src/inc.c:708
 #, fuzzy
 msgid "Done"
 msgstr "Atlikta."
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Nepavyko prisijungti"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Nepavyko patvirtinti autentiškumo"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Užrakinta"
 
-#: src/inc.c:732
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Baigėsi skirtasis laikas"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Baigta (Nauji laiškai: %d)"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, fuzzy, c-format
 msgid "Finished (no new messages)"
 msgstr "Baigta (Nėra naujų laiškų: %d)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Klaidos gaunant paštą."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "gaunami „%s“ sąskaitos laiškai...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Tikrinamas autentiškumas (POP3)"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: gaunami nauji laiškai"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Jungiuosi prie POP3 serverio: %s..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Negaliu prisijungti prie POP3 serverio: %s:%d\n"
 
-#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Patvirtinamas autentiškumas..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Gaunami laiškai iš %s..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Gaunamas naujų laiškų skaičius (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Gaunamas naujų laiškų skaičius (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Gaunamas naujų laiškų skaičius (UILD)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Gaunamas naujų laiškų dydis (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Trinamas laiškas %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Išeinu"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Gaunamas laiškas (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "Nepavyko prisijungti."
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "Klaida tvarkant paštą."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2818,29 +2818,29 @@ msgstr ""
 "Klaida tvarkant paštą:\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Nėra vietos diske."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Negaliu įrašyti į failą."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Socket error."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "Prisijungimas uždarytas nuotolinio serverio."
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "Dėžutė užrakinta."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2849,11 +2849,11 @@ msgstr ""
 "Dėžutė užrakinta:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Nepavyko patvirtinti autentiškumo."
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2862,15 +2862,15 @@ msgstr ""
 "Nepavyko patvirtinti autentiškumo:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Baigėsi sesijos laikas."
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Prijungimas nutrauktas\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Gaunami nauji laiškai iš %s į %s...\n"
diff --git a/po/nl.po b/po/nl.po
index 3c4d25b9..e671830b 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+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"
@@ -213,34 +213,34 @@ msgstr "iconv kan UTF-7 niet naar %s omzetten\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan %s niet naar UTF-7 omzetten\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "kan niet naar tijdelijk bestand schrijven\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Berichten worden van %s naar %s opgehaald...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "kan mbox bestand niet inlezen.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "mbox formaat is onjuist: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "onjuist formaat in mbox: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "kan tijdelijk bestand niet openen\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -249,43 +249,43 @@ msgstr ""
 "Afzender zonder escapecodes gevonden:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "kan lock-bestand niet aanmaken: %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "gebruik 'flock' in plaats van 'file' waar mogelijk\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "kan %s niet aanmaken\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "mailbox wordt vastgehouden door een ander proces. we wachten even...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "kan %s niet locken\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "ongeldig locktype\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "kan de lock niet verwijderen van %s\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "kan de mailbox niet inkorten tot 0.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Berichten worden geëxporteerd van %s naar %s...\n"
@@ -514,7 +514,7 @@ msgstr "Troepfilter"
 msgid "Junk mail filter"
 msgstr "Troepfilter"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Codeconversie mislukt\n"
 
@@ -1225,7 +1225,7 @@ msgstr "Bericht"
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Fout"
 
@@ -2702,157 +2702,157 @@ msgstr "Importeer LDIF bestand in het adresboek"
 msgid "Attributes"
 msgstr "Attributen"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nieuwe berichten"
 
-#: src/inc.c:479
+#: src/inc.c:477
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Bezig met identificatie"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "Een ogenblik geduld alstublieft"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Afgebroken"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Bezig met ophalen"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Klaar (%d bericht(en) (%s) ontvangen)"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Geen nieuwe berichten."
 
-#: src/inc.c:710
+#: src/inc.c:708
 #, fuzzy
 msgid "Done"
 msgstr "Klaar."
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Identificatie mislukt"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Vergrendeld"
 
-#: src/inc.c:732
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Time-out"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Klaar (%d nieuwe bericht(en))"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Klaar (geen nieuwe berichten)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Er is een fout opgetreden bij het ophalen van de e-mail."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "nieuwe berichten voor account %s worden opgehaald...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Bezig met identificatie"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Verbinden met POP3-server: %s ..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, 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:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Bezig met identificatie..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Berichten ophalen van %s..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Opvragen van het aantal nieuwe berichten (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Opvragen van het aantal nieuwe berichten (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Opvragen van de grootte van de nieuwe berichten (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Bezig met verwijderen van bericht %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Bezig met afsluiten"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Bericht wordt opgehaald (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "Verbinding mislukt."
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "Fout bij het verwerken van de e-mail"
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2861,30 +2861,30 @@ msgstr ""
 "Fout bij het verwerken van de e-mail:\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "De ruimte op de schijf is op."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Het bestand is niet beschrijfbaar."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Socket-fout."
 
 #  consider EOF right after QUIT successful
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "Verbinding verbroken door verbindingspartner."
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "Mailbox is vergrendeld."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2893,11 +2893,11 @@ msgstr ""
 "Mailbox is vergrendeld:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Identificatie mislukt."
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2906,15 +2906,15 @@ msgstr ""
 "Identificatie mislukt:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Sessie is verlopen."
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "E-mail verwerken geannuleerd\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Nieuwe berichten worden opgehaald van %s naar %s ...\n"
diff --git a/po/pl.po b/po/pl.po
index cc01b1c8..1c3f1fa3 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+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"
@@ -208,34 +208,34 @@ msgstr "nie można skonwertować UTF-7 do %s za pomocą programu iconv\n"
 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:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "nie można zapisać do pliku tymczasowego\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Pobieranie wiadomości z %s do %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "nie można odczytać pliku mbox.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "niepoprawny format mbox: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "uszkodzona skrzynka: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "nie można otworzyć pliku tymczasowego\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -244,43 +244,43 @@ msgstr ""
 "znaleziono \"unescaped\" From:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "nie można utworzyć pliku lock %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 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:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "nie można utworzyć %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "skrzynka jest kontrolowana przez inny proces, oczekiwanie...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "nie można zablokować %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "nieprawidłowy typ blokady\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "nie można odblokować %s\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "nie można skrócić do zera.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Eksportowanie wiadomości z %s do %s...\n"
@@ -499,7 +499,7 @@ msgstr "Filtr niechcianej poczty (ręczny)"
 msgid "Junk mail filter"
 msgstr "Filtr niechcianej poczty"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmine_get_text_content(): Błąd konwersji kodu.\n"
 
@@ -1202,7 +1202,7 @@ msgstr "Notatka"
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Błąd"
 
@@ -2660,142 +2660,142 @@ msgstr "Importuj plik LDIF do książki adresowej"
 msgid "Attributes"
 msgstr "Atrybuty"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nowe wiadomości"
 
-#: src/inc.c:479
+#: src/inc.c:477
 msgid "Authenticating with POP3"
 msgstr "Uwierzytelnianie POP3"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Pobieranie nowych wiadomości"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "Oczekiwanie"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Anulowano"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Pobieranie"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Gotowe (%d wiadomośći (%s) odebrano)"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Brak nowych wiadomości"
 
-#: src/inc.c:710
+#: src/inc.c:708
 #, fuzzy
 msgid "Done"
 msgstr "Gotowe."
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Błąd połączenia"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Błąd autoryzacji"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Zablokowano"
 
-#: src/inc.c:732
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Opóźnienie"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Zakończono (%d nowe wiadomości)"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Zakończono (brak nowych wiadomości)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Wystąpiły błędy podczas pobierania poczty."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "pobieranie nowych wiadomości z konta %s ...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Uwierzytelnianie POP3"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Pobieranie nowych wiadomości"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Nawiązywanie połączenia z serwerem POP3: %s..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, 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:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Uwierzytelnianie..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Pobieranie wiadomości z %s..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Pobieranie liczby nowych wiadomości (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Pobieranie liczby nowych wiadomości (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Pobieranie liczby nowych wiadomości (UIDL)"
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Pobieranie rozmiaru wiadomości (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Usuwanie wiadomości %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Wychodzenie"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Pobieranie wiadomości (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2804,15 +2804,15 @@ msgstr ""
 "niepowodzeniem.\n"
 "Sprawdź ustawienia filtrów niechcianej poczty."
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "Błąd połączenia."
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2821,29 +2821,29 @@ msgstr ""
 "Błąd podczas przetwarzania wiadomości:\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Brak miejsca na dysku."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Nie można zapisać pliku."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Błąd gniazda."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "Połączenie zamknięte przez zdalny komputer."
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "Skrzynka jest zablokowana."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2852,11 +2852,11 @@ msgstr ""
 "Skrzynka jest zablokowana:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Błąd uwierzytelniania."
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2865,15 +2865,15 @@ msgstr ""
 "Błąd uwierzytelniania:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Sesja wygasła."
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Odbieranie anulowano\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Pobieranie wiadomości z %s do %s...\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 80fddecb..7d255606 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+0900\n"
 "PO-Revision-Date: 2008-11-28 01:00-0700\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
@@ -218,34 +218,34 @@ msgstr "o iconv não pode converter UTF-7 para %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "o iconv não pode converter %s para UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "não é possível gravar no arquivo temporário\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Obtendo Mensagens de %s até %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "não foi possível ler o arquivo mbox.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "formato de mbox inválido: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "mbox corrompida: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "não foi possível abrir o arquivo temporário\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -254,43 +254,43 @@ msgstr ""
 "Encontrado De sem codificar:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, 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:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "usar 'flock' em vez de 'file' se for possível.\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "não foi possível criar %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "o correio está sendo usado por outro processo, aguardando...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "não foi possível travar %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "tipo de trava inválido\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "não foi possível destravar %s\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "não foi possível zerar o mailbox.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportando mensagens de %s em %s...\n"
@@ -515,7 +515,7 @@ msgstr "Filtro de spam (manual)"
 msgid "Junk mail filter"
 msgstr "Filtro de spam"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Conversão de código falhou.\n"
 
@@ -1216,7 +1216,7 @@ msgstr "Notificação"
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Erro"
 
@@ -2678,141 +2678,141 @@ msgstr "Importar arquivo LDIF para o Catálogo de Endereços"
 msgid "Attributes"
 msgstr "Atributos"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d novas mensagens"
 
-#: src/inc.c:479
+#: src/inc.c:477
 msgid "Authenticating with POP3"
 msgstr "Autenticando via POP3"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Obtendo novas mensagens"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "Aguardando"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, c-format
 msgid "%d message(s) (%s) received"
 msgstr "%d mensagen(s) (%s) recebida(s)"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, c-format
 msgid "no new messages"
 msgstr "não há mensagens novas"
 
-#: src/inc.c:710
+#: src/inc.c:708
 msgid "Done"
 msgstr "Concluído"
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Conexão falhou"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Autenticação falhou"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Travado"
 
-#: src/inc.c:732
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Tempo limite"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Concluído (%d nova(s) mensagem(ns))"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Concluído (Não há mensagens novas)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Alguns erros aconteceram ao baixar os emails."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obtendo novas mensagens da conta %s...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Autenticando via POP3"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando novas mensagens"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando ao servidor POP3: %s..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, 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:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Recebendo mensagens de %s..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtendo o número de novas mensagens (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtendo o número de novas mensagens (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtendo o número de novas mensagens (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o número de novas mensagens (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Apagando mensagem %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Saindo"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Baixando mensagem (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2820,15 +2820,15 @@ msgstr ""
 "Execução do filtro de spam falhou.\n"
 "Por favor verifique as definições do filtro de spam."
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "Falha na conexão"
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "Ocorreu um erro enquanto as mensagens eram processadas."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2837,29 +2837,29 @@ msgstr ""
 "Erro ao processar mensagens:\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Não há espaço disponível no disco."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Não foi possível gravar o arquivo."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "erro de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "Conexão remota finalizada pela estação remota."
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "Caixa de correio está travada."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2868,11 +2868,11 @@ msgstr ""
 "Caixa de correio está trancada:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2881,15 +2881,15 @@ msgstr ""
 "Falha de autenticação:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Tempo limite da sessão."
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Incorporação cancelada\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obtendo novas mensagens de %s até %s...\n"
diff --git a/po/ro.po b/po/ro.po
index 42ef66e9..d59dc38c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 11:36+0900\n"
-"PO-Revision-Date: 2008-11-19 19:56+0200\n"
+"POT-Creation-Date: 2008-12-15 17:55+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"
 "MIME-Version: 1.0\n"
@@ -85,12 +85,12 @@ msgstr "nu se pot seta fanioanele de ștergere: 1:*\n"
 
 #: libsylph/imap.c:1676
 msgid "can't close folder\n"
-msgstr "nu se poate închide folderul\n"
+msgstr "nu se poate închide dosarul\n"
 
 #: libsylph/imap.c:1755
 #, c-format
 msgid "root folder %s not exist\n"
-msgstr "folderul root %s nu există\n"
+msgstr "dosarul root %s nu există\n"
 
 #: libsylph/imap.c:1955 libsylph/imap.c:1963
 msgid "error occurred while getting LIST.\n"
@@ -163,7 +163,7 @@ msgstr "nu se poate obține spațiul de nume\n"
 #: libsylph/imap.c:3320
 #, c-format
 msgid "can't select folder: %s\n"
-msgstr "nu se poate selecta folderul: %s\n"
+msgstr "nu se poate selecta dosarul: %s\n"
 
 #: libsylph/imap.c:3355
 msgid "error on imap command: STATUS\n"
@@ -220,34 +220,34 @@ msgstr "iconv nu poate efectua conversia UTF-7 la %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nu poate efectua conversia %s la UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "nu se poate scrie în fișierul temporar\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Obținere mesaje de la %s în %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "nu se poate citi fișierul mbox.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "formatul mbox nu este valid: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "mbox malformat: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "nu se poate deschide fișierul temporar\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -256,43 +256,43 @@ msgstr ""
 "a fost găsit câmp From „unescaped”:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "nu se poate crea fișierul „lock” %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "dacă este posibil, folosiți „flock” în loc de „file”.\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "nu se poate crea %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 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:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "nu se poate bloca %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "tipul de blocare nu este valid\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "nu se poate debloca %s\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "nu se poate trunchia la zero căsuța poștală.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportare mesaje din %s în %s...\n"
@@ -308,7 +308,7 @@ msgstr "Nu se poate deschide fișierul de marcaj.\n"
 
 #: libsylph/mh.c:548 libsylph/mh.c:669
 msgid "the src folder is identical to the dest.\n"
-msgstr "folderul sursă este identic cu cel destinație.\n"
+msgstr "dosarul sursă este identic cu cel de destinație.\n"
 
 #: libsylph/mh.c:672
 #, c-format
@@ -322,7 +322,7 @@ msgid ""
 "Can't create folder."
 msgstr ""
 "Fișierul „%s” există deja.\n"
-"Nu se poate crea folderul."
+"Nu se poate crea dosarul."
 
 #: libsylph/mh.c:1538
 #, c-format
@@ -517,7 +517,7 @@ msgstr "Filtru mesaj spam (manual)"
 msgid "Junk mail filter"
 msgstr "Filtru mesaj spam"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): conversia codului a eșuat.\n"
 
@@ -845,7 +845,7 @@ msgstr "Observații"
 
 #: src/addressadd.c:219
 msgid "Select Address Book Folder"
-msgstr "Selectați folderul pentru agendă"
+msgstr "Selectați dosarul pentru agendă"
 
 #: src/addressbook.c:334 src/compose.c:560 src/mainwindow.c:532
 #: src/messageview.c:149
@@ -921,7 +921,7 @@ msgstr "/A_dresă/_Grup nou"
 
 #: src/addressbook.c:357
 msgid "/_Address/New _Folder"
-msgstr "/A_dresă/_Folder nou"
+msgstr "/A_dresă/_Dosar nou"
 
 #: src/addressbook.c:358
 msgid "/_Address/---"
@@ -942,11 +942,11 @@ msgstr "/_Unelte"
 
 #: src/addressbook.c:363
 msgid "/_Tools/Import _LDIF file"
-msgstr "/_Unelte/Importă fișier _LDIF"
+msgstr "/_Unelte/Importă un fișier _LDIF"
 
 #: src/addressbook.c:364
 msgid "/_Tools/Import _CSV file"
-msgstr "/_Unelte/Importă fișier _CSV"
+msgstr "/_Unelte/Importă un fișier _CSV"
 
 #: src/addressbook.c:366 src/compose.c:716 src/mainwindow.c:870
 #: src/messageview.c:302
@@ -968,7 +968,7 @@ msgstr "/_Grup nou"
 
 #: src/addressbook.c:388 src/addressbook.c:398
 msgid "/New _Folder"
-msgstr "/_Folder nou"
+msgstr "/_Dosar nou"
 
 #: src/addressbook.c:389 src/addressbook.c:399 src/addressbook.c:402
 #: src/compose.c:554 src/folderview.c:251 src/folderview.c:253
@@ -1063,20 +1063,20 @@ msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
 "If deleting the folder only, addresses will be moved into parent folder."
 msgstr ""
-"Vreți să ștergeți folderul ȘI toate adresele din „%s” ?\n"
-"Dacă ștergeți doar folderul, adresele vor fi mutate în folderul părinte."
+"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:2491
 msgid "Delete folder"
-msgstr "Ștergere folder"
+msgstr "Ștergere dosar"
 
 #: src/addressbook.c:1643
 msgid "_Folder only"
-msgstr "Doar _folder"
+msgstr "Doar _dosar"
 
 #: src/addressbook.c:1643
 msgid "Folder and _addresses"
-msgstr "Folder și _adrese"
+msgstr "Dosar și _adrese"
 
 #: src/addressbook.c:1648
 #, c-format
@@ -1202,7 +1202,7 @@ msgstr "Grupă"
 #: src/addressbook.c:3227 src/folderview.c:378 src/prefs_account_dialog.c:1835
 #: src/query_search.c:400
 msgid "Folder"
-msgstr "Folder"
+msgstr "Dosar"
 
 #: src/addressbook.c:3243
 msgid "vCard"
@@ -1232,7 +1232,7 @@ msgstr "Notificare"
 msgid "Warning"
 msgstr "Avertisment"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Eroare"
 
@@ -1305,7 +1305,7 @@ msgstr "/_Fișier/Trimite _mai târziu"
 # !!! dependent de traducerea lui draft !!!
 #: src/compose.c:566
 msgid "/_File/Save to _draft folder"
-msgstr "/_Fișier/Salvează în folderul _ciorne"
+msgstr "/_Fișier/Salvează în dosarul _ciorne"
 
 #: src/compose.c:568
 msgid "/_File/Save and _keep editing"
@@ -1767,7 +1767,7 @@ msgstr "punere mesaj în coada de așteptare...\n"
 
 #: src/compose.c:4152
 msgid "can't find queue folder\n"
-msgstr "nu se poate găsi folderul de coadă\n"
+msgstr "nu se poate găsi dosarul de coadă\n"
 
 #: src/compose.c:4159
 msgid "can't queue the message\n"
@@ -1872,7 +1872,7 @@ msgstr "Salvare mesaj"
 # !!! dependent de traducerea lui draft !!!
 #: src/compose.c:7069
 msgid "This message has been modified. Save it to draft folder?"
-msgstr "Acest mesaj a fost modificat. Îl salvați în folderul Ciorne ?"
+msgstr "Acest mesaj a fost modificat. Îl salvați în dosarul Ciorne ?"
 
 #: src/compose.c:7071
 msgid "Close _without saving"
@@ -2043,20 +2043,20 @@ msgstr "Adăugare grup nou"
 
 #: src/editgroup.c:537
 msgid "Edit folder"
-msgstr "Editare folder"
+msgstr "Editare dosar"
 
 #: src/editgroup.c:537
 msgid "Input the new name of folder:"
-msgstr "Introduceți noul nume al folderului:"
+msgstr "Introduceți noul nume al dosarului:"
 
 #: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2234
 #: src/folderview.c:2240
 msgid "New folder"
-msgstr "Folder nou"
+msgstr "Dosar nou"
 
 #: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2241
 msgid "Input the name of new folder:"
-msgstr "Introduceți numele noului folder:"
+msgstr "Introduceți numele dosarului nou:"
 
 #: src/editjpilot.c:200
 msgid "File does not appear to be JPilot format."
@@ -2178,13 +2178,14 @@ msgstr "Editare înregistrare vCard"
 msgid "Add New vCard Entry"
 msgstr "Adăugare înregistrare vCard"
 
+# titlu la export mbox
 #: src/export.c:148
 msgid "Export"
-msgstr "Exportă"
+msgstr "Export"
 
 #: src/export.c:167
 msgid "Specify target folder and mbox file."
-msgstr "Specificați folderul destinație și fișierul mbox."
+msgstr "Specificați dosarul sursă și fișierul mbox."
 
 #: src/export.c:177
 msgid "Source dir:"
@@ -2192,15 +2193,13 @@ msgstr "Director sursă:"
 
 #: src/export.c:182
 msgid "Exporting file:"
-msgstr "Exportare fișier:"
+msgstr "Fișier de export:"
 
 #: src/export.c:195 src/export.c:201 src/import.c:201 src/import.c:207
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Selectare... "
 
-# hm ? sau selectează fișier de exportat ?
-# sau selectează fișierul de exportat ?
 #: src/export.c:239
 msgid "Select exporting file"
 msgstr "Selectați fișierul de exportat"
@@ -2223,7 +2222,7 @@ msgstr "Selectare director"
 
 #: src/foldersel.c:252
 msgid "Select folder"
-msgstr "Selectare folder"
+msgstr "Selectare dosar"
 
 #: src/foldersel.c:390 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
@@ -2247,39 +2246,39 @@ msgstr "Ciorne"
 
 #: src/foldersel.c:587 src/folderview.c:2238 src/folderview.c:2242
 msgid "NewFolder"
-msgstr "Folder nou"
+msgstr "Dosar nou"
 
 #: src/foldersel.c:595 src/folderview.c:2250 src/folderview.c:2311
 #, c-format
 msgid "`%c' can't be included in folder name."
-msgstr "„%c” nu poate fi inclus în numele folderului."
+msgstr "„%c” nu poate fi inclus în numele dosarului."
 
 #: src/foldersel.c:605 src/folderview.c:2260 src/folderview.c:2319
 #: src/query_search.c:1052
 #, c-format
 msgid "The folder `%s' already exists."
-msgstr "Folderul „%s” există deja."
+msgstr "Dosarul „%s” există deja."
 
 #: src/foldersel.c:613 src/folderview.c:2267
 #, c-format
 msgid "Can't create the folder `%s'."
-msgstr "Folderul „%s” nu a putut fi creat."
+msgstr "Dosarul „%s” nu a putut fi creat."
 
 #: src/folderview.c:247 src/folderview.c:269
 msgid "/Create _new folder..."
-msgstr "/Creează un folder _nou..."
+msgstr "/Creează un dosar _nou..."
 
 #: src/folderview.c:248 src/folderview.c:270 src/folderview.c:296
 msgid "/_Rename folder..."
-msgstr "/_Redenumește folderul..."
+msgstr "/_Redenumește dosarul..."
 
 #: src/folderview.c:249 src/folderview.c:271
 msgid "/_Move folder..."
-msgstr "/_Mută folderul..."
+msgstr "/_Mută dosarul..."
 
 #: src/folderview.c:250 src/folderview.c:272 src/folderview.c:297
 msgid "/_Delete folder"
-msgstr "/Șterge fol_derul"
+msgstr "/Șterge _dosarul"
 
 #: src/folderview.c:252 src/folderview.c:274
 msgid "/Empty _trash"
@@ -2289,9 +2288,10 @@ msgstr "/_Golește gunoiul"
 msgid "/_Check for new messages"
 msgstr "/Verifi_că pentru mesaje noi"
 
+# hm ? sau la singular ?
 #: src/folderview.c:256 src/folderview.c:280
 msgid "/R_ebuild folder tree"
-msgstr "/R_econstruiește arborele folder"
+msgstr "/R_econstruiește arborele de dosare"
 
 #: src/folderview.c:257 src/folderview.c:281 src/folderview.c:303
 msgid "/_Update summary"
@@ -2323,12 +2323,13 @@ msgstr "/Ște_rge grupul de știri"
 
 #: src/folderview.c:331
 msgid "Creating folder view...\n"
-msgstr "Creare vizualizare folder...\n"
+msgstr "Creare vizualizare dosar...\n"
 
 #: src/folderview.c:408
 msgid "New"
 msgstr "Nou"
 
+# comun și când search și în dropdown-ul din fereastra principală
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:67 src/quick_search.c:96
@@ -2341,43 +2342,47 @@ msgstr "Total"
 
 #: src/folderview.c:573
 msgid "Setting folder info...\n"
-msgstr "Setare informații folder...\n"
+msgstr "Setare informații dosar...\n"
 
 #: src/folderview.c:574
 msgid "Setting folder info..."
-msgstr "Setare informații folder..."
+msgstr "Setare informații dosar..."
 
 #: src/folderview.c:882 src/mainwindow.c:4027 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
-msgstr "Scanare folder %s%c%s ..."
+msgstr "Scanare dosar %s%c%s ..."
 
 #: src/folderview.c:886 src/mainwindow.c:4032 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
-msgstr "Scanare folder %s ..."
+msgstr "Scanare dosar %s ..."
 
+# hm ? sau la singular ?
 #: src/folderview.c:928
 msgid "Rebuild folder tree"
-msgstr "Reconstruire arbore folder"
+msgstr "Reconstruire arbore de dosare"
 
+# hm ? sau la singular ?
 #: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
-msgstr "Arborele folder va fi reconstruit. Continuați ?"
+msgstr "Arborele de dosare va fi reconstruit. Continuați ?"
 
+# hm ? sau la singular ?
 #: src/folderview.c:938
 msgid "Rebuilding folder tree..."
-msgstr "Reconstruire arbore folder..."
+msgstr "Reconstruire arbore de dosare..."
 
+# hm ? sau la singular ?
 #: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
-msgstr "Reconstruirea arborelui folder a eșuat."
+msgstr "Reconstruirea arborelui de dosare a eșuat."
 
-# !!! nu este clar unde apare !!!
+# nu este clar unde apare
 # (IMAP ?)
 #: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
-msgstr "Verifică pentru mesaje noi în toate folderele..."
+msgstr "Verifică pentru mesaje noi în toate dosarele..."
 
 #: src/folderview.c:1247 src/prefs_common_dialog.c:1929 src/prefs_toolbar.c:68
 msgid "Junk"
@@ -2386,7 +2391,7 @@ msgstr "Spam"
 #: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
-msgstr "Este selectat folderul %s\n"
+msgstr "Este selectat dosarul %s\n"
 
 #: src/folderview.c:2074
 #, c-format
@@ -2414,8 +2419,8 @@ msgid ""
 "(if you want to create a folder to store subfolders,\n"
 " append `/' at the end of the name)"
 msgstr ""
-"Introduceți numele noului folder:\n"
-"(dacă vreți să creați un folder care să conțină subfoldere,\n"
+"Introduceți numele noului dosar:\n"
+"(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:2299
@@ -2425,17 +2430,17 @@ msgstr "Introduceți noul nume pentru „%s”:"
 
 #: src/folderview.c:2300
 msgid "Rename folder"
-msgstr "Redenumește folderul"
+msgstr "Redenumește dosarul"
 
 #: src/folderview.c:2331 src/folderview.c:2339
 #, c-format
 msgid "Can't rename the folder '%s'."
-msgstr "Nu se poate redenumi folderul „%s”."
+msgstr "Nu se poate redenumi dosarul „%s”."
 
 #: src/folderview.c:2412
 #, c-format
 msgid "Can't move the folder `%s'."
-msgstr "Nu se poate muta folderul „%s”."
+msgstr "Nu se poate muta dosarul „%s”."
 
 #: src/folderview.c:2481
 #, c-format
@@ -2443,12 +2448,12 @@ msgid ""
 "Delete the search folder '%s' ?\n"
 "The real messages are not deleted."
 msgstr ""
-"Ștergeți folderul de căutare „%s” ?\n"
+"Ștergeți dosarul de căutare „%s” ?\n"
 "Mesajele reale NU sunt șterse de pe disc."
 
 #: src/folderview.c:2483
 msgid "Delete search folder"
-msgstr "Șterge folderul pentru căutare"
+msgstr "Șterge dosarul pentru căutare"
 
 #: src/folderview.c:2488
 #, c-format
@@ -2458,7 +2463,7 @@ msgid ""
 "\n"
 "Do you really want to delete?"
 msgstr ""
-"Toate folderele și mesajele din „%s” vor fi șterse permanent.\n"
+"Toate dosarele și mesajele din „%s” vor fi șterse permanent.\n"
 "Recuperarea nu va fi posibilă.\n"
 "\n"
 "Chiar vreți să ștergeți ?"
@@ -2466,7 +2471,7 @@ msgstr ""
 #: src/folderview.c:2520 src/folderview.c:2526
 #, c-format
 msgid "Can't remove the folder '%s'."
-msgstr "Nu se poate șterge folderul „%s”."
+msgstr "Nu se poate șterge dosarul „%s”."
 
 #: src/folderview.c:2562
 msgid "Empty trash"
@@ -2474,7 +2479,7 @@ msgstr "Golire gunoi"
 
 #: src/folderview.c:2563
 msgid "Delete all messages in the trash folder?"
-msgstr "Ștergeți toate mesajele din folderul de gunoi ?"
+msgstr "Ștergeți toate mesajele din dosarul de gunoi ?"
 
 #: src/folderview.c:2604
 #, c-format
@@ -2537,25 +2542,23 @@ msgstr "Creare vizualizare imagine...\n"
 msgid "Can't load the image."
 msgstr "Imaginea nu a putut fi încărcată."
 
+# titlu la import mbox
 #: src/import.c:154
 msgid "Import"
-msgstr "Importă"
+msgstr "Import"
 
 #: src/import.c:173
 msgid "Specify target mbox file and destination folder."
-msgstr "Specificați fișierul mbox țintă și folderul destinație."
+msgstr "Specificați fișierul mbox sursă și dosarul destinație."
 
-# hm ? sau import fișier ?
 #: src/import.c:183
 msgid "Importing file:"
-msgstr "Importare fișier:"
+msgstr "Fișier de import:"
 
 #: src/import.c:188
 msgid "Destination dir:"
 msgstr "Director destinație:"
 
-# hm ? sau selectează fișier de importat ?
-# sau selectează fișierul de importat ?
 #: src/import.c:245
 msgid "Select importing file"
 msgstr "Selectați fișierul de importat"
@@ -2714,141 +2717,141 @@ msgstr "Import de fișier LDIF în agendă"
 msgid "Attributes"
 msgstr "Atribute"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d mesaje noi"
 
-#: src/inc.c:479
+#: src/inc.c:477
 msgid "Authenticating with POP3"
 msgstr "Autentificare cu POP3"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Recepționare mesaje noi"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "Așteptare"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Anulat"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Recepționare"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, c-format
 msgid "%d message(s) (%s) received"
 msgstr "%d mesaj(e) (%s) primit(e)"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, c-format
 msgid "no new messages"
 msgstr "nu sunt mesaje noi"
 
-#: src/inc.c:710
+#: src/inc.c:708
 msgid "Done"
 msgstr "Gata"
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Conexiunea a eșuat"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Autentificarea a eșuat"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Blocat"
 
-#: src/inc.c:732
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Timp expirat"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Terminat (%d mesaj(e) noi)"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Terminat (nu sunt mesaje noi)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Au apărut unele erori în timpul obținerii mail-ului."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obținere mesaje noi pentru contul %s...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Autentificare cu POP3"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: recepționare mesaje noi"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectare la serverul POP3: %s ..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, 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:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentificare..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Recepționare mesaje de la %s..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obținerea numărului de mesaje noi (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obținerea numărului de mesaje noi (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obținerea numărului de mesaje noi (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obținerea dimensiunii mesajelor (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Ștergere mesaje %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Părăsire"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recepționare mesaje (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2856,15 +2859,15 @@ msgstr ""
 "Execuția comenzii filtrului de spam a eșuat.\n"
 "Verificați setările controlului de spam."
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "Conexiunea a eșuat"
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "A apărut o eroare în timpul procesării mail-ului."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2873,29 +2876,29 @@ msgstr ""
 "A apărut o eroare în timpul procesării mail-ului.\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Nu mai este spațiu pe disc."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Nu se poate scrie fișierul."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Eroare socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "Conexiune închisă de serverul de la distanță."
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "Căsuța poștală este blocată"
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2904,11 +2907,11 @@ msgstr ""
 "Căsuța poștală este blocată:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Autentificarea a eșuat."
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2917,15 +2920,15 @@ msgstr ""
 "Autentificarea a eșuat:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Timpul sesiunii a expirat."
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Încorporarea a fost anulată\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obținere mesaje noi de la %s în %s...\n"
@@ -2988,7 +2991,7 @@ msgid ""
 "                         show the status of each folder"
 msgstr ""
 "  --status-full [folder]...\n"
-"                         arată starea fiecărui folder"
+"                         arată starea fiecărui dosar"
 
 #: src/main.c:531
 msgid "  --open folderid/msgnum open message in new window"
@@ -3100,23 +3103,23 @@ msgstr ""
 
 #: src/mainwindow.c:533
 msgid "/_File/_Folder"
-msgstr "/_Fișier/_Folder"
+msgstr "/_Fișier/_Dosar"
 
 #: src/mainwindow.c:534
 msgid "/_File/_Folder/Create _new folder..."
-msgstr "/_Fișier/_Folder/Creează un folder _nou..."
+msgstr "/_Fișier/_Dosar/Creează un dosar _nou..."
 
 #: src/mainwindow.c:536
 msgid "/_File/_Folder/_Rename folder..."
-msgstr "/_Fișier/_Folder/_Redenumește folderul..."
+msgstr "/_Fișier/_Dosar/_Redenumește dosarul..."
 
 #: src/mainwindow.c:537
 msgid "/_File/_Folder/_Move folder..."
-msgstr "/_Fișier/_Folder/_Mută folderul..."
+msgstr "/_Fișier/_Dosar/_Mută dosarul..."
 
 #: src/mainwindow.c:538
 msgid "/_File/_Folder/_Delete folder"
-msgstr "/_Fișier/_Folder/Șter_ge folderul"
+msgstr "/_Fișier/_Dosar/Șter_ge dosarul"
 
 #: src/mainwindow.c:539
 msgid "/_File/_Mailbox"
@@ -3144,21 +3147,22 @@ msgstr ""
 "/_Fișier/_Căsuță poștală/Verifică pentru mesaje noi în to_ate căsuțele "
 "poștale"
 
+# hm ? sau la singular ?
 #: src/mainwindow.c:548
 msgid "/_File/_Mailbox/R_ebuild folder tree"
-msgstr "/_Fișier/_Căsuță poștală/R_econstruiește arborele folder"
+msgstr "/_Fișier/_Căsuță poștală/R_econstruiește arborele de dosare"
 
 #: src/mainwindow.c:551
 msgid "/_File/_Import mbox file..."
-msgstr "/_Fișier/_Importă fișier mbox..."
+msgstr "/_Fișier/_Importă un fișier mbox..."
 
 #: src/mainwindow.c:552
 msgid "/_File/_Export to mbox file..."
-msgstr "/_Fișier/_Exportă fișier mbox..."
+msgstr "/_Fișier/_Exportă în fișier mbox..."
 
 #: src/mainwindow.c:554
 msgid "/_File/Empty all _trash"
-msgstr "/_Fișier/_Golește gunoiul"
+msgstr "/_Fișier/_Golește tot gunoiul"
 
 #: src/mainwindow.c:556 src/messageview.c:150
 msgid "/_File/_Save as..."
@@ -3201,9 +3205,10 @@ msgstr "/_Editare/Căutare _rapidă"
 msgid "/_View/Show or hi_de"
 msgstr "/_Vizualizare/Arată sau as_cunde"
 
+# hm ? sau la singular ?
 #: src/mainwindow.c:580
 msgid "/_View/Show or hi_de/_Folder tree"
-msgstr "/_Vizualizare/Arată sau ascun_de/Arbore _folder"
+msgstr "/_Vizualizare/Arată sau ascun_de/Arbore de _dosare"
 
 #: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/_Message view"
@@ -3258,9 +3263,10 @@ msgstr "/_Vizualizare/Aran_jament/_Normal"
 msgid "/_View/Layou_t/_Vertical"
 msgstr "/_Vizualizare/Aran_jament/_Vertical"
 
+# hm ? sau la singular ?
 #: src/mainwindow.c:605
 msgid "/_View/Separate f_older tree"
-msgstr "/_Vizualizare/Separă fereastra arb_orelui folderelor"
+msgstr "/_Vizualizare/Separă fereastra arb_orelui de dosare"
 
 #: src/mainwindow.c:606
 msgid "/_View/Separate _message view"
@@ -3588,7 +3594,7 @@ msgstr "/_Unelte/A_daugă expeditorul în agendă..."
 
 #: src/mainwindow.c:821
 msgid "/_Tools/_Filter all messages in folder"
-msgstr "/_Unelte/_Filtrează toate mesajele în folder"
+msgstr "/_Unelte/_Filtrează toate mesajele în dosar"
 
 #: src/mainwindow.c:823
 msgid "/_Tools/Filter _selected messages"
@@ -3616,7 +3622,7 @@ msgstr "/_Unelte/_Creează regulă de filtrare/pe baza câmpului _Subiect"
 
 #: src/mainwindow.c:835
 msgid "/_Tools/Filter _junk mails in folder"
-msgstr "/_Unelte/Filtrează mesa_jele spam în folder"
+msgstr "/_Unelte/Filtrează mesa_jele spam în dosar"
 
 #: src/mainwindow.c:837
 msgid "/_Tools/Filter junk _mails in selected messages"
@@ -3756,7 +3762,7 @@ msgstr "Golire gunoi"
 
 #: src/mainwindow.c:1740
 msgid "Delete all messages in trash folders?"
-msgstr "Ștergeți toate mesajele din folderele de gunoi ?"
+msgstr "Ștergeți toate mesajele din dosarele de gunoi ?"
 
 #: src/mainwindow.c:1770
 msgid "Add mailbox"
@@ -3793,7 +3799,7 @@ msgstr ""
 
 #: src/mainwindow.c:2305
 msgid "Sylpheed - Folder View"
-msgstr "Sylpheed - Vizualizare folder"
+msgstr "Sylpheed - Vizualizare dosar"
 
 #: src/mainwindow.c:2324
 msgid "Sylpheed - Message View"
@@ -3864,9 +3870,8 @@ msgid "Exit this program?"
 msgstr "Ieșiți din acest program ?"
 
 #: src/mainwindow.c:3793
-#, fuzzy
 msgid "Select folder to open"
-msgstr "Selectare folder"
+msgstr "Selectați dosarul de deschis"
 
 #: src/mainwindow.c:3943
 msgid "Command line options"
@@ -3928,7 +3933,7 @@ msgstr ""
 "primește mesaje noi pentru toate conturile\n"
 "trimite toate mesajele de la coada de așteptare\n"
 "arată numărul total de mesaje\n"
-"arată starea fiecărui folder\n"
+"arată starea fiecărui dosar\n"
 "deschide mesajul în fereastră nouă\n"
 "specifică directorul care conține fișierele de configurare\n"
 "ieșire Sylpheed\n"
@@ -4311,7 +4316,7 @@ msgstr "Inbox-ul implicit"
 
 #: src/prefs_account_dialog.c:966
 msgid "Unfiltered messages will be stored in this folder."
-msgstr "Mesajele nefiltrate vor fi stocate în acest folder."
+msgstr "Mesajele nefiltrate vor fi stocate în acest dosar."
 
 #: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
@@ -4530,7 +4535,7 @@ msgstr "Director server IMAP"
 
 #: src/prefs_account_dialog.c:1828
 msgid "Only the subfolders of this directory will be displayed."
-msgstr "Vor fi afișate numai subfolderele acestui director."
+msgstr "Vor fi afișate numai subdosarele acestui director."
 
 # hm ?
 #: src/prefs_account_dialog.c:1831
@@ -4583,7 +4588,7 @@ msgstr "Nu a fost introdus serverul NNTP."
 
 #: src/prefs_account_dialog.c:2006
 msgid "Specified folder is not a queue folder."
-msgstr "Folderul specificat nu este folder de coadă."
+msgstr "Dosarul specificat nu este dosar de coadă."
 
 #: src/prefs_account_dialog.c:2116
 msgid ""
@@ -4738,10 +4743,9 @@ msgstr "minut(e)"
 msgid "Check new mail on startup"
 msgstr "Verifică pentru eventuale mesaje noi la pornirea programului"
 
-# ???
 #: src/prefs_common_dialog.c:796
 msgid "Update all local folders after incorporation"
-msgstr "Actualizează toate folderele locale după încorporare"
+msgstr "Actualizează toate dosarele locale după încorporare"
 
 #: src/prefs_common_dialog.c:801
 msgid "Execute command when new messages arrived"
@@ -4774,7 +4778,7 @@ msgstr "Cale spool"
 # !!! dependent de traducerea lui Outbox !!!
 #: src/prefs_common_dialog.c:903
 msgid "Save sent messages to outbox"
-msgstr "Salvează mesajele trimise în folderul „Trimise”"
+msgstr "Salvează mesajele trimise în dosarul „Trimise”"
 
 #: src/prefs_common_dialog.c:905
 msgid "Apply filter rules to sent messages"
@@ -4940,11 +4944,11 @@ msgstr "Font text"
 #. ---- Folder View ----
 #: src/prefs_common_dialog.c:1489
 msgid "Folder View"
-msgstr "Vizualizare foldere"
+msgstr "Vizualizare dosare"
 
 #: src/prefs_common_dialog.c:1497
 msgid "Display unread number next to folder name"
-msgstr "Afișează numărul de mesaje necitite lângă numele folderului"
+msgstr "Afișează numărul de mesaje necitite lângă numele dosarului"
 
 # hm ?
 #: src/prefs_common_dialog.c:1499
@@ -5108,11 +5112,11 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:1977
 msgid "Junk folder"
-msgstr "Folder spam"
+msgstr "Dosar de spam"
 
 #: src/prefs_common_dialog.c:1995
 msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr "Mesajele care sunt marcate ca spam vor fi mutate în acest folder."
+msgstr "Mesajele care sunt marcate ca spam vor fi mutate în acest dosar."
 
 #: src/prefs_common_dialog.c:2006
 msgid "Filter messages classified as junk on receiving"
@@ -5171,7 +5175,7 @@ msgstr "Deschide totdeauna mesajele în mod sumar când sunt selectate"
 
 #: src/prefs_common_dialog.c:2194
 msgid "Open first unread message when a folder is opened"
-msgstr "Deschide primul mesaj necitit la deschiderea unui folder"
+msgstr "Deschide primul mesaj necitit la deschiderea unui dosar"
 
 #: src/prefs_common_dialog.c:2201
 msgid "Remember last selected message"
@@ -5184,11 +5188,11 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:2209
 msgid "Open inbox after receiving new mail"
-msgstr "Deschide folderul „Primite (Inbox)” după primirea de mesaje noi"
+msgstr "Deschide dosarul „Primite (Inbox)” după primirea de mesaje noi"
 
 #: src/prefs_common_dialog.c:2211
 msgid "Open inbox on startup"
-msgstr "Deschide folderul „Primite (Inbox)” la pornirea programului"
+msgstr "Deschide dosarul „Primite (Inbox)” la pornirea programului"
 
 #: src/prefs_common_dialog.c:2219
 msgid "Execute immediately when moving or deleting messages"
@@ -5314,8 +5318,8 @@ msgid ""
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
-"Activați această opțiune dacă conținutul folderelor are posibilitatea de a "
-"fi modificat de alte aplicații.\n"
+"Activați această opțiune dacă conținutul dosarelor are posibilitatea de a fi "
+"modificat de alte aplicații.\n"
 "Această opțiune va degrada performanța de afișare a sumarului."
 
 #: src/prefs_common_dialog.c:2615
@@ -5792,6 +5796,7 @@ msgstr "Rezultatul comenzii"
 msgid "Age"
 msgstr "Vârstă"
 
+# comun și când search și în dropdown-ul din fereastra principală
 #: src/prefs_filter_edit.c:508 src/quick_search.c:97
 msgid "Marked"
 msgstr "Marcat"
@@ -5903,7 +5908,7 @@ msgstr "Oprește evaluarea de regulă"
 
 #: src/prefs_filter_edit.c:696 src/prefs_filter_edit.c:1059
 msgid "folder:"
-msgstr "folder:"
+msgstr "dosar:"
 
 #: src/prefs_filter_edit.c:1020
 msgid "day(s)"
@@ -5932,7 +5937,7 @@ msgstr "Comanda nu este specificată."
 
 #: src/prefs_filter_edit.c:1816 src/prefs_filter_edit.c:1823
 msgid "Destination folder is not specified."
-msgstr "Folderul de destinație nu a fost specificat."
+msgstr "Dosarul de destinație nu a fost specificat."
 
 #: src/prefs_filter_edit.c:1893
 msgid "Invalid condition exists."
@@ -5956,7 +5961,7 @@ msgstr "Nu există acțiune."
 
 #: src/prefs_folder_item.c:118
 msgid "Folder properties"
-msgstr "Proprietăți folder"
+msgstr "Proprietăți dosar"
 
 #: src/prefs_folder_item.c:186
 msgid "Identifier"
@@ -6011,11 +6016,11 @@ msgstr "Toate condițiile următoare"
 
 #: src/prefs_search_folder.c:231 src/query_search.c:322
 msgid "Folder:"
-msgstr "Folder:"
+msgstr "Dosar:"
 
 #: src/prefs_search_folder.c:248 src/query_search.c:340
 msgid "Search subfolders"
-msgstr "Caută și în subfoldere"
+msgstr "Caută și în subdosare"
 
 #: src/prefs_summary_column.c:66
 msgid "Mark"
@@ -6251,7 +6256,7 @@ msgstr "Ciornă"
 
 #: src/prefs_toolbar.c:109
 msgid "Save to draft folder"
-msgstr "Salvează în folderul de ciorne"
+msgstr "Salvează în dosarul de ciorne"
 
 #: src/prefs_toolbar.c:111
 msgid "Insert"
@@ -6328,7 +6333,7 @@ msgstr "Progres"
 
 #: src/query_search.c:425
 msgid "_Save as search folder"
-msgstr "_Salvează ca folder de căutare"
+msgstr "_Salvează ca dosar de căutare"
 
 #: src/query_search.c:547
 #, c-format
@@ -6361,7 +6366,7 @@ msgstr "(Fără Dată)"
 
 #: src/query_search.c:890
 msgid "Save as search folder"
-msgstr "Salvează ca folder de căutare"
+msgstr "Salvează ca dosar de căutare"
 
 #: src/query_search.c:911
 msgid "Location:"
@@ -6369,7 +6374,7 @@ msgstr "Locație:"
 
 #: src/query_search.c:926
 msgid "Folder name:"
-msgstr "Nume folder:"
+msgstr "Nume dosar:"
 
 #: src/quick_search.c:95
 msgid "All"
@@ -6387,11 +6392,11 @@ msgstr "Cu atașament"
 
 #: src/quick_search.c:101
 msgid "Within 1 day"
-msgstr "Timp de o zi"
+msgstr "Din ultima zi"
 
 #: src/quick_search.c:102
 msgid "Last 5 days"
-msgstr "Ultimele 5 zile"
+msgstr "Din ultimele 5 zile"
 
 #: src/quick_search.c:111
 msgid "Search:"
@@ -6983,7 +6988,7 @@ msgstr "Au rămas unele marcaje. Doriți să fie procesate ?"
 #: src/summaryview.c:728
 #, c-format
 msgid "Scanning folder (%s)..."
-msgstr "Scanare folder (%s)..."
+msgstr "Scanare dosar (%s)..."
 
 #: src/summaryview.c:1390
 msgid "_Search again"
@@ -7003,7 +7008,7 @@ msgstr "Nu sunt mesaje necitite."
 
 #: src/summaryview.c:1421
 msgid "No unread message found. Go to next folder?"
-msgstr "Nu s-a găsit nici un mesaj necitit. Mergeți la folderul următor ?"
+msgstr "Nu s-a găsit nici un mesaj necitit. Mergeți la dosarul următor ?"
 
 #: src/summaryview.c:1429 src/summaryview.c:1438
 msgid "No more new messages"
@@ -7019,7 +7024,7 @@ msgstr "Nu sunt mesaje noi."
 
 #: src/summaryview.c:1439
 msgid "No new message found. Go to next folder?"
-msgstr "Nu s-a găsit nici un mesaj nou. Mergeți la folderul următor ?"
+msgstr "Nu s-a găsit nici un mesaj nou. Mergeți la dosarul următor ?"
 
 #: src/summaryview.c:1447 src/summaryview.c:1456
 msgid "No more marked messages"
@@ -7151,12 +7156,11 @@ msgstr "Mesajul %d este marcat pentru mutare în %s\n"
 
 #: src/summaryview.c:3390
 msgid "Destination is same as current folder."
-msgstr "Destinația este aceeași cu folderul curent."
+msgstr "Destinația este aceeași cu dosarul curent."
 
 #: src/summaryview.c:3427
-#, fuzzy
 msgid "Select folder to move"
-msgstr "Selectare folder"
+msgstr "Selectați dosarul de mutat"
 
 #: src/summaryview.c:3457
 #, c-format
@@ -7165,12 +7169,11 @@ msgstr "Mesajul %d este setat pentru copiere în %s\n"
 
 #: src/summaryview.c:3488
 msgid "Destination for copy is same as current folder."
-msgstr "Destinația pentru copiere este aceeași cu folderul curent."
+msgstr "Destinația pentru copiere este aceeași cu dosarul curent."
 
 #: src/summaryview.c:3524
-#, fuzzy
 msgid "Select folder to copy"
-msgstr "Selectare folder"
+msgstr "Selectați dosarul de copiat"
 
 #: src/summaryview.c:3669
 msgid "Error occurred while processing messages."
diff --git a/po/ru.po b/po/ru.po
index 04521aba..35a33392 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+0900\n"
 "PO-Revision-Date: 2007-07-22 12:53+0400\n"
 "Last-Translator: Andrey Markelov <andrey@markelov.net>\n"
 "Language-Team: Russian <Project-Id-Version: gtranslato>\n"
@@ -213,34 +213,34 @@ msgstr "ошибка преобразования iconv из UTF-7 в %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "ошибка преобразования iconv из %s в UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "ошибка записи во временный файл\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Получение сообщений из %s в %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "ошибка чтения файла mbox.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "неверный формат почтового ящика: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "испорченный почтовый ящик: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "ошибка при открытии временного файла \n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -249,43 +249,43 @@ msgstr ""
 "найдена незащищённая строка From:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "ошибка создания файла блокировки %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "используйте \"flock\" вместо \"file\", если возможно.\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "не удалось создать %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "почтовый ящик занят другим процессом, ожидание...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "не удалось блокировать %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "Неверный тип блокировки\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "не удалось разблокировать %s\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "не удалось обрезать почтовый ящик до нуля.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Экспорт сообщений из %s в %s...\n"
@@ -510,7 +510,7 @@ msgstr "Фильтр спама"
 msgid "Junk mail filter"
 msgstr "Фильтр спама"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Ошибка преобразования кодировки.\n"
 
@@ -1211,7 +1211,7 @@ msgstr "Уведомление"
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Ошибка"
 
@@ -2674,142 +2674,142 @@ msgstr "Импорт файла LDIF в адресную книгу"
 msgid "Attributes"
 msgstr "Атрибуты"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed (новых сообщений: %d)"
 
-#: src/inc.c:479
+#: src/inc.c:477
 msgid "Authenticating with POP3"
 msgstr "Аутентификация POP3"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Получение новых сообщений"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "Ожидание"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Отменена"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Получение"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Выполнено (принято сообщений: %d (%s))"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Нет новых сообщений."
 
-#: src/inc.c:710
+#: src/inc.c:708
 #, fuzzy
 msgid "Done"
 msgstr "Выполнено."
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Ошибка соединения"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Неверный пароль"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Занято"
 
-#: src/inc.c:732
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Нет ответа"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Завершено (новых сообщений: %d)"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Завершено (нет новых сообщений)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "При получении сообщений возникли ошибки."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "получение новых сообщений для учётной записи %s...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Аутентификация POP3"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Получение новых сообщений"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Соединение с сервером POP3: %s..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не удалось соединиться с сервером POP3: %s:%d\n"
 
-#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Аутентификация..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Получение сообщений с %s..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Получение количества новых сообщений (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Получение количества новых сообщений (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Получение количества новых сообщений (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Получение размера сообщений (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Удаление сообщения %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Выход"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получение сообщения (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2817,15 +2817,15 @@ msgstr ""
 "Не удалось выполненить команду фильтрации спама.\n"
 "Проверьте настройки фильтрации спама."
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "Ошибка соединения"
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "Произошла ошибка при обработке сообщений."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2834,29 +2834,29 @@ msgstr ""
 "Произошла ошибка при обработке сообщений:\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Нет места на диске."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Ошибка записи в файл."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Ошибка сокета."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "Сервер закрыл соединение."
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "Почтовый ящик занят."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2865,11 +2865,11 @@ msgstr ""
 "Почтовый ящик занят:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Ошибка аутентификации."
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2878,15 +2878,15 @@ msgstr ""
 "Ошибка аутентификации:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Время сеанса истекло."
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Приём сообщений прерван\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Получение новых сообщений из %s в %s...\n"
diff --git a/po/sk.po b/po/sk.po
index 62ca32d9..ef01190f 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+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"
@@ -214,34 +214,34 @@ msgstr "iconv nemôže skonvertovať UTF-7 na %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nemôže skonvertovať %s na UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "nemôžem zapisovať do dočasného súboru\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Prijímam správy z %s do %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "nemôžem prečítať súbor mbox.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "neplatný formát mbox: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "poškodený mbox: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "nemôžem otvoriť dočasný súbor\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -250,43 +250,43 @@ msgstr ""
 "neukončené From:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "nemôžem vytvoriť zámkový súbor %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "ak je to možné, miesto 'file' použite 'flock'.\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "nemôžem vytvoriť %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "iný proces vlastní mailbox, čakám...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "nemôžem uzamknúť %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "neplatný typ zámku\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "nemôžem odomknúť %s\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "nemôžem skrátiť mailbox na nulovú dĺžku.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportujem správy z %s do %s...\n"
@@ -508,7 +508,7 @@ msgstr "Priečinok"
 msgid "Junk mail filter"
 msgstr "Priečinok"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Nepodarilo sa skonvertovať kód.\n"
 
@@ -1221,7 +1221,7 @@ msgstr "Upozornenie"
 msgid "Warning"
 msgstr "Varovanie"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Chyba"
 
@@ -2745,158 +2745,158 @@ msgstr "Importovať súbor LDIF do adresára"
 msgid "Attributes"
 msgstr "Atribúty"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Dokončené (%d nových správ)"
 
-#: src/inc.c:479
+#: src/inc.c:477
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autentizácia"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Prijímam nové správy"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "Čakajte"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Zrušené"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Prijímam"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Hotovo (%d správ (%s) prijatých)"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Žiadne nové správy."
 
-#: src/inc.c:710
+#: src/inc.c:708
 #, fuzzy
 msgid "Done"
 msgstr "Hotovo."
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Autentizácia zlyhala"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Zamknuté"
 
-#: src/inc.c:732
+#: src/inc.c:730
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (v sekundách)"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Dokončené (%d nových správ)"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Dokončené (žiadne nové správy)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Pri prijímaní pošty sa vyskytli chyby."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "prijímam nové správy pre konto %s...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autentizácia"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prijímam nové správy"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Pripájam sa k serveru POP3: %s..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, 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:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentizácia..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Prijímam správy z %s..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Získavam počet nových správ (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Získavam počet nových správ (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Získavam počet nových správ (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Získavam veľkosť správ (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Odstraňujem správu %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Odpájam sa"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prijímam správu (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "Spojenie zlyhalo."
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2905,29 +2905,29 @@ msgstr ""
 "Pri spracovávaní pošty sa vyskytla chyba:\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Na disku už nie je miesto."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Nedá sa zapisovať do súboru."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Chyba socketu."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "Vzdialený hostiteľ ukončil spojenie."
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "Mailbox je zamknutý."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2936,11 +2936,11 @@ msgstr ""
 "Mailbox je zamknutý:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Autentizácia bola neúspešná."
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2949,16 +2949,16 @@ msgstr ""
 "Autentizácia bola neúspešná:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 #, fuzzy
 msgid "Session timed out."
 msgstr "čas spojenia vypršal\n"
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Začleňovanie zrušené\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Prijímam nové správy z %s do %s...\n"
diff --git a/po/sl.po b/po/sl.po
index b7468c60..7c13105b 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+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"
@@ -217,34 +217,34 @@ msgstr "iconv ne more pretvoriti UTF-7 v %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne more pretvoriti %s v UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "ne morem pisati v začasno datoteko\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "ne morem prebrati datoteke mbox.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "napačen format mbox: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "napačno oblikovan mbox: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "ne morem odpreti začasne datoteke\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -253,43 +253,43 @@ msgstr ""
 "najdeno neubežno polje Od:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "ne morem narediti datoteke za zaklepanje %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "če je mogoče, uporabi 'flock' namesto 'file'.\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "ne morem narediti %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "poštni predal si lasti drug proces, čakam...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "ne morem zakleniti %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "neveljaven tip zaklepanja\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "ne morem odkleniti %s\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "ne morem prisekati poštnega predala na ničlo.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Izvažam sporočila iz %s v %s...\n"
@@ -513,7 +513,7 @@ msgstr "Mapa"
 msgid "Junk mail filter"
 msgstr "Mapa"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Pretvorba kodiranja ni uspela.\n"
 
@@ -1226,7 +1226,7 @@ msgstr "Opomba"
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Napaka"
 
@@ -2750,215 +2750,215 @@ msgstr "Uvozi datoteko LDIF v imenik naslovov"
 msgid "Attributes"
 msgstr "Atributi"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Končano (%d novih sporočil)"
 
-#: src/inc.c:479
+#: src/inc.c:477
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Overovljam"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Prenašam nova sporočila"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "V pripravljenosti"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Preklicano"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Prenašam"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Opravljeno (%d sporočil (%s) prejetih)"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Ni novih sporočil."
 
-#: src/inc.c:710
+#: src/inc.c:708
 #, fuzzy
 msgid "Done"
 msgstr "Opravljeno."
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Overovitev ni uspela"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Zaklenjeno"
 
-#: src/inc.c:732
+#: src/inc.c:730
 #, fuzzy
 msgid "Timeout"
 msgstr "Čas izteka (sek.)"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Končano (%d novih sporočil)"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Končano (ni novih sporočil)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Med prejemanjem pošte je prišlo do nekaterih napak."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "sprejemam nova sporočila z računa %s...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Overovljam"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prenašam nova sporočila"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se s strežnikom POP: %s"
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, 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:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Overovljam..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Ugotavljam število novih sporočil (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Ugotavljam število novih sporočil (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Ugotavljam število novih sporočil (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Ugotavljam velikost sporočil (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Brišem sporočilo %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Zapuščam"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prenašam sporočilo (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 #, fuzzy
 msgid "Connection failed."
 msgstr "Povezava ni uspela"
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Na disku ni prostora."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Ne morem napisati datoteke."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "napaka v priključku."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "Poštni predal je zaklenjen."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Poštni predal je zaklenjen."
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Pripojitev odpovedana\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Pobiram nova sporočila iz %s v %s...\n"
diff --git a/po/sr.po b/po/sr.po
index 23822184..068cc133 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -218,34 +218,34 @@ msgstr "iconv ne može prebaciti UTF-7 to %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne može prebaciti %s to UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "ne mogu pisati u privremenu datoteku\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "ne mogu čitati mbox datoteku.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "pogrešan mbox format: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "pokvaren mbox: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "ne mogu otvoriti privremenu datoteku\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -254,43 +254,43 @@ msgstr ""
 "neizbežan Od pronađen:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "ne mogu napraviti zaključanu datoteku %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "koristi 'flock' umesto 'file' ako je moguće.\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "ne mogu napraviti %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "neki drugi proces koristi sanduče, čekam...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "ne mogu zaključati %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "neispravan tip zaključavanja\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "ne mogu otključati %s\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "ne mogu skratiti sanduče na nulu.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Izvozim poruke iz %s u %s...\n"
@@ -514,7 +514,7 @@ msgstr "Direktorijum"
 msgid "Junk mail filter"
 msgstr "Direktorijum"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Promena koda nije uspjela.\n"
 
@@ -1220,7 +1220,7 @@ msgstr "Obaveštenje"
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Greška"
 
@@ -2745,214 +2745,214 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Attributes"
 msgstr "Atributi"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Završeno (%d novih poruka)"
 
-#: src/inc.c:479
+#: src/inc.c:477
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Provera identiteta"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Primam nove poruke"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "Standby"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Primam"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Gotovo (%d poruke/a (%s) primljeno)"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Nema novih poruka."
 
-#: src/inc.c:710
+#: src/inc.c:708
 msgid "Done"
 msgstr "Gotovo"
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Veza nije ostvarena"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Identifikacija nije uspela"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Zaključano"
 
-#: src/inc.c:732
+#: src/inc.c:730
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Završeno (%d novih poruka)"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Došlo je do grešaka prilikom primanja pošte."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "primam nove poruke za nalog %s...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Provera identiteta"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Primam nove poruke"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se na POP3 server: %s ..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, 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:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Preuzimam broj novih poruka (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Preuzimam broj novih poruka (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Preuzimam broj novih poruka (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Preuzimam veličinu poruka (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Brišem poruke %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Izlazim"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 #, fuzzy
 msgid "Connection failed."
 msgstr "Veza nije ostvarena"
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, 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:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Nema više mesta na disku."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Ne mogu pisati u datoteku."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Protokol greška."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "Sanduče je zaključano."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Sanduče je zaključano."
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Način provere identieta"
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Način provere identieta"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Incorporation otkazano\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Primam nove poruke od %s u %s...\n"
diff --git a/po/sv.po b/po/sv.po
index 7c998405..9488ebf8 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+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"
@@ -211,34 +211,34 @@ msgstr "iconv kan inte konvertera UTF-7 till %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan inte konvertera %s till UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "kan inte skriva till temporär fil\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Hämtar meddelanden från %s till %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "kan inte läsa mboxfil.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "felaktigt mboxformat: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "felformad mbox: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "kan inte öppna temporär fil\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -247,43 +247,43 @@ msgstr ""
 "o-esc:at Från-fält funnet:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "kan inte skapa låsfil %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 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:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "kan inte skapa %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "brevlådan ägs av en annan process, väntar...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "kan inte låsa %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "felaktig låstyp\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "kan inte låsa upp %s\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "kan inte korta av brevlåda till noll.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exporterar meddelanden från %s till %s...\n"
@@ -510,7 +510,7 @@ msgstr "Skräppostfilter"
 msgid "Junk mail filter"
 msgstr "Skräppostfilter"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Kodkonvertering misslyckades.\n"
 
@@ -1217,7 +1217,7 @@ msgstr "Notera"
 msgid "Warning"
 msgstr "Varning"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Fel"
 
@@ -2700,157 +2700,157 @@ msgstr "Importera LDIF-fil till adressboken"
 msgid "Attributes"
 msgstr "Attribut"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nya meddelanden"
 
-#: src/inc.c:479
+#: src/inc.c:477
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autentiserar"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Hämtar nya meddelanden"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "Vänta"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Hämtar"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Färdig (%d meddelande(n) (%s) mottagna)"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Inga nya meddelanden."
 
-#: src/inc.c:710
+#: src/inc.c:708
 #, fuzzy
 msgid "Done"
 msgstr "Färdig."
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Förbindelse misslyckades"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Autentisering misslyckades"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Låst"
 
-#: src/inc.c:732
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Slut på väntetid"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Avslutad (%d nya meddelanden)"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Avslutad (inga nya meddelanden)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Fel uppstod vid hämtning av post."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "hämtar nya meddelanden från kontot %s...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autentiserar"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Hämtar nya meddelanden"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Ansluter till POP3-server: %s ..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, 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:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentiserar..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Hämtar meddelanden från %s..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Tar emot meddelandenas antal (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Tar emot meddelandenas antal (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Tar emot meddelandenas antal (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Tar emot meddelandenas storlek (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Tar bort meddelande %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Avslutar"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Tar emot meddelande (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "Förbindelse misslyckades."
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "Fel uppstod när e-posten behandlades."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2859,29 +2859,29 @@ msgstr ""
 "Fel uppstod när e-posten behandlades:\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Inget diskutrymme kvar."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Kan inte skriva fil."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Fel på uttag (socket)."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "Anslutningen stängdes av fjärrvärden."
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "Brevlådan är låst."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2890,11 +2890,11 @@ msgstr ""
 "Brevlådan är låst:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Autentisering misslyckades."
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2903,15 +2903,15 @@ msgstr ""
 "Autentisering misslyckades:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Sessionens väntetid tog slut."
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Inkorporering avbruten\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Hämtar nya meddelanden från %s till %s...\n"
diff --git a/po/tr.po b/po/tr.po
index fcd1ecc8..f46f40d0 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+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"
@@ -218,34 +218,34 @@ msgstr "iconv, UTF-7 yi %s'e çeviremedi\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv %s yi UTF-7'ye çeviremedi\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "geçici dosyaya yazılamadı\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "%s daki mesajlar %s e alınıyor...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "Posta kutusu dosyası okunamıyor.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "geçersiz posta kutusu biçimi: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "bozuk posta kutusu: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "geçici dosya açılamadı\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -254,44 +254,44 @@ msgstr ""
 "uygun olmayan Kimden:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "kilit dosyası yaratılamadı: %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "file yerine flock kullanmayı deneyin.\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "%s oluşturulamadı\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 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:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "%s kilitlenemedi\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "geçersiz kilit türü\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "%s açılamadı\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "posta kutusu sıfırlanamıyor.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "%s daki mesajlar %s a aktarılıyor...\n"
@@ -512,7 +512,7 @@ msgstr "dizin:"
 msgid "Junk mail filter"
 msgstr "dizin:"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Kod çevriminde hata.\n"
 
@@ -1222,7 +1222,7 @@ msgstr "Not"
 msgid "Warning"
 msgstr "Uyarı"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Hata"
 
@@ -2735,157 +2735,157 @@ msgstr "LDIF dosyasını Adres Defterine aktar"
 msgid "Attributes"
 msgstr "Özellikler"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Tamamlandı (%d yeni mesaj)"
 
-#: src/inc.c:479
+#: src/inc.c:477
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr " Kimlik denetimi"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Yeni iletiler alınıyor"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "Bekle"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "İptal edildi"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Alınıyor"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Tamamlandı (%d mesaj, (%s) alındı)"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Yeni ileti yok."
 
-#: src/inc.c:710
+#: src/inc.c:708
 #, fuzzy
 msgid "Done"
 msgstr "Tamamlandı."
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Bağlantıda hata"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Kimlik denetiminde hata"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Kilitli"
 
-#: src/inc.c:732
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Zaman aşımı"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Tamamlandı (%d yeni mesaj)"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Tamamlandı (yeni mesaj yok)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr " İletiler alınırken bazı hatalar oluştu."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s hesabındaki yeni iletiler alınıyor...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr " Kimlik denetimi"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Yeni iletiler alınıyor"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3 sunucusuna bağlantı kuruluyor: %s ..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3 sunucuya bağlantı kurulamadı: %s:%d\n"
 
-#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Kimlik denetimi yapılıyor..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s konumundan iletiler alınıyor..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Yeni ileti numaraları alınıyor (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Yeni ileti numaraları alınıyor (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Yeni ileti numaraları alınıyor (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "İletilerin boyutları alınıyor (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d. ileti siliniyor"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Çıkılıyor"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "İletiler alınıyor (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "Bağlantıda hata oluştu."
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "İletiler işlenirken bir hata oluştu."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2894,29 +2894,29 @@ msgstr ""
 "E-posta işlenirken hata oluştu:\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Yeterli disk alanı kalmadı."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Dosyaya yazılamadı."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "protokol hatası"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "Bağlantı karşı taraftan kesildi."
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "Posta kutusu kilitli"
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2925,11 +2925,11 @@ msgstr ""
 "Posta kutusu kilitli:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Yetkilendirmede hata oluştu."
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2938,15 +2938,15 @@ msgstr ""
 "Yetkilendirme başarısız:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Oturum zaman aşımına uğradı."
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "İptal edildi\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s'den yeni mesajlar %s e alınıyor...\n"
diff --git a/po/uk.po b/po/uk.po
index 63f96560..c70f6a5c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.4.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+0900\n"
 "PO-Revision-Date: 2008-01-18 19:07+0300\n"
 "Last-Translator: O.R. Nykyforchyn <nick@pu.if.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -216,34 +216,34 @@ msgstr "iconv не може конвертувати UTF-7 в %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може конвертувати %s в UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "неможливо писати в тимчасовий файл\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Отримуємо листи від %s в %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "не вдалось прочитати файл mbox.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "неправильний формат файла mbox: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "неправильно збудований mbox: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "неможливо відкрити тимчасовий файл\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -252,43 +252,43 @@ msgstr ""
 "знайдено незахищений рядок From:\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "не вдалось створити lock-файл %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "якщо можливо, вживайте 'flock' замість 'file'\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "не вдалось створити %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "скринька зайнята іншим процесом, чекаємо...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "не вдалось заблокувати %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "неправильний тип блокування\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "не вдалось розблокувати %s\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "не вдалось обрізати скриньку до нуля.\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Експортуємо листи з %s в %s...\n"
@@ -515,7 +515,7 @@ msgstr "Фільтр мотлоху (вручну)"
 msgid "Junk mail filter"
 msgstr "фільтр мотлоху"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Перетворення кодів не вдалось.\n"
 
@@ -1208,7 +1208,7 @@ msgstr "Примітка"
 msgid "Warning"
 msgstr "Попередження"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Помилка"
 
@@ -2670,142 +2670,142 @@ msgstr "Імпортувати файл LDIF в адресну книгу"
 msgid "Attributes"
 msgstr "Атрибути"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d нових листів"
 
-#: src/inc.c:479
+#: src/inc.c:477
 msgid "Authenticating with POP3"
 msgstr "Аутентифікація з POP3"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Отримання нових листів"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "Очікування"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Скасовано"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Отримання"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Виконано (%d лист(ів) (%s) отримано)"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Немає нових листів"
 
-#: src/inc.c:710
+#: src/inc.c:708
 #, fuzzy
 msgid "Done"
 msgstr "Виконано."
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Невдача з'єднання"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Невдача автентифікації"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Заблоковано"
 
-#: src/inc.c:732
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Таймаут"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Закінчено (%d нових листів)"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Закінчено (немає нових листів)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "При отриманні пошти трапились деякі помилки."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "отримання нової пошти для запису %s...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Аутентифікація з POP3"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Отримання нових листів"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "З'єднуємось з сервером POP3: %s ..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не вдалось з'єднатись з сервером POP3: %s:%d\n"
 
-#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Автентифікація..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Отримуємо листи від %s..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Отримуємо кількість нових листів (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Отримуємо кількість нових листів (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Отримуємо кількість нових листів (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Отримуємо розмір листів (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Видаляємо лист %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Виходимо"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Отримуємо лист (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2813,15 +2813,15 @@ msgstr ""
 "Невдача виконання команди фільтрування мотлоху.\n"
 "Будь-ласка, перевірте налаштування."
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "Невдача з'єднання."
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "При обробці пошти трапилась помилка."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2830,29 +2830,29 @@ msgstr ""
 "При обробці пошти трапилась помилка:\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Немає вільного місця на диску."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Не вдалось писати в файл."
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Помилка сокета."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "З'єднання закрито віддаленим хостом."
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "Скриньку заблоковано."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2861,11 +2861,11 @@ msgstr ""
 "Скриньку заблоковано:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Невдача аутентифікації."
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2874,15 +2874,15 @@ msgstr ""
 "Невдача аутентифікації:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Таймаут сесії."
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Включення скасовано\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Отримуємо нові листи від %s в %s...\n"
diff --git a/po/vi.po b/po/vi.po
index bb20c4f0..433631b8 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+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"
@@ -211,77 +211,77 @@ msgstr "iconv không thể chuyển UTF-7 sang %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv không thể chuyển %s sang UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "không ghi được vào tập tin tạm\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Lấy thư từ %s vào %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "không đọc được tập tin mbox.\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "định dạng mbox không hợp lệ: %s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "mbox có lỗi: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "không mở được tập tin tạm\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
 "%s"
 msgstr ""
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, 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:300
+#: libsylph/mbox.c:298
 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:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "không tạo được %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 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:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "không thể khoá %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "kiểu khoá không hợp lệ\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "không thể mở khoá %s\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 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:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Xuất thư từ %s sang %s...\n"
@@ -508,7 +508,7 @@ msgstr "Lọc thư rác"
 msgid "Junk mail filter"
 msgstr "Lọc thư rác"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Chuyển đổi mã thất bại.\n"
 
@@ -1200,7 +1200,7 @@ msgstr "Chú ý"
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Lỗi"
 
@@ -2674,157 +2674,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:161
+#: src/inc.c:159
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d thư mới"
 
-#: src/inc.c:479
+#: src/inc.c:477
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Đang xác thực"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "Đang tải về thư mới"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "Đợi"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "Đã bị huỷ bỏ"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "Đang tải về"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Xong (%d thư (%s) nhận được)"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Không có thư mới."
 
-#: src/inc.c:710
+#: src/inc.c:708
 #, fuzzy
 msgid "Done"
 msgstr "Xong."
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "Kết nối thất bại"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "Xác thực thất bại"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Đã khoá"
 
-#: src/inc.c:732
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Hết giờ"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Hoàn tất (%d thư mới)"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Hoàn tất (không có thư mới)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Xảy ra một số lỗi khi nhận thư."
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, 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:832
+#: src/inc.c:830
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Đang xác thực"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Đang nhận thư mới"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Đang kết nối tới máy chủ POP3: %s..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, 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:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Đang xác thực..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Đang lấy thư trên %s..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Đang xác định số lượng thư mới (STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Đang xác định số lượng thư mới (LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Đang xác định số lượng thư mới (UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "Đang xác định kích thước thư (LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "Đang xoá thư %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "Đang thoát"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Đang lấy thư (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "Kết nối thất bại."
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "Có lỗi khi xử lí thư."
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2833,29 +2833,29 @@ msgstr ""
 "Có lỗi khi xử lí thư:\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "Ổ cứng bị đầy."
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "Không thể ghi lên tập tin"
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Lỗi socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "Kết nối bị ngắt bởi máy từ xa."
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "Hộp thư bị khoá."
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2864,11 +2864,11 @@ msgstr ""
 "Hộp thư bị khoá:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Xác thực thất bại."
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2877,15 +2877,15 @@ msgstr ""
 "Xác thực thất bại:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Phiên làm việc hết giờ."
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "Sáp nhập bị huỷ bỏ\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Đang lấy thư từ %s vào %s...\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 585eb16c..428237f7 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+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"
@@ -214,34 +214,34 @@ msgstr "iconv 无法转换 UTF-7 到 %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv 无法转换 %s 到 UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "无法写入临时文件\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "正在从 %s 获取邮件到 %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "无法读取 mbox 文件。\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "无效的 mbox 格式：%s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "格式不正确的 mbox：%s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "无法打开临时文件\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -250,43 +250,43 @@ msgstr ""
 "找到没有转码的发件人：\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "无法创建锁文件 %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "如果可能，用“flock”代替“file”。\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "无法创建 %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "另一个进程拥有该邮箱，等待...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "无法锁住 %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "无效的锁类型\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "无法解锁 %s\n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "无法将邮箱删除为空。\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "正在从 %s 导出信件到 %s...\n"
@@ -507,7 +507,7 @@ msgstr "文件夹："
 msgid "Junk mail filter"
 msgstr "文件夹："
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content()：代码转换失败。\n"
 
@@ -1208,7 +1208,7 @@ msgstr "注意"
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "错误"
 
@@ -2697,156 +2697,156 @@ msgstr "导入 LDIF 文件到地址簿"
 msgid "Attributes"
 msgstr "属性"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "完成 (%d 个新邮件)"
 
-#: src/inc.c:479
+#: src/inc.c:477
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "正在验证"
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "正在获取新邮件"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "请等待"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "正在获取"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "完成 (收到 %d 个邮件 (%s))"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "没有新邮件"
 
-#: src/inc.c:710
+#: src/inc.c:708
 msgid "Done"
 msgstr "完成"
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "验证失败"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "锁住"
 
-#: src/inc.c:732
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "超时"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完成 (%d 个新邮件)"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "完成 (没有新邮件)"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "获取邮件时发生错误。"
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "正在获取帐号 %s 的新邮件...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "正在验证"
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s：正在获取新邮件"
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "正在连接POP3服务器：%s..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "无法连接POP3服务器：%s:%d\n"
 
-#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "正在验证..."
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "正在从 %s 获取邮件..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "正在获取新邮件数量(STAT)..."
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "正在获取新邮件数量(LAST)..."
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "正在获取新邮件数量(UIDL)..."
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "正在获取新邮件的大小(LIST)..."
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "正在删除邮件 %d"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "正在退出"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "正在获取邮件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "连接失败"
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "处理邮件时发生错误。"
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2855,29 +2855,29 @@ msgstr ""
 "处理邮件时发生错误：\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "没有剩余磁盘空间。"
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "无法写入文件。"
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Socket错误。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "远程主机关闭了连接。"
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "信箱被锁住。"
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2886,11 +2886,11 @@ msgstr ""
 "信箱被锁住：\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "验证失败。"
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2899,15 +2899,15 @@ msgstr ""
 "验证失败：\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "会话超时。"
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "合并新邮件被取消\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "正在从 %s 获取新邮件到 %s...\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c9a5b03e..225b9950 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: 2008-12-01 11:36+0900\n"
+"POT-Creation-Date: 2008-12-15 17:55+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"
@@ -213,34 +213,34 @@ msgstr "無法將 UTF-7 轉換為 %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "無法轉換 %s 為 UTF-7\n"
 
-#: libsylph/mbox.c:50 libsylph/mbox.c:207
+#: libsylph/mbox.c:48 libsylph/mbox.c:205
 msgid "can't write to temporary file\n"
 msgstr "無法寫入暫存檔。\n"
 
-#: libsylph/mbox.c:79
+#: libsylph/mbox.c:77
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "從 %s 中取得郵件放入 %s...\n"
 
-#: libsylph/mbox.c:89
+#: libsylph/mbox.c:87
 msgid "can't read mbox file.\n"
 msgstr "無法讀取 mbox 檔案。\n"
 
-#: libsylph/mbox.c:96
+#: libsylph/mbox.c:94
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "不合法的 mbox 格式：%s\n"
 
-#: libsylph/mbox.c:103
+#: libsylph/mbox.c:101
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "損壞的 mbox: %s\n"
 
-#: libsylph/mbox.c:121
+#: libsylph/mbox.c:119
 msgid "can't open temporary file\n"
 msgstr "無法開啟暫存檔。\n"
 
-#: libsylph/mbox.c:172
+#: libsylph/mbox.c:170
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -249,43 +249,43 @@ msgstr ""
 "不完整的 From 格式：\n"
 "%s"
 
-#: libsylph/mbox.c:299
+#: libsylph/mbox.c:297
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "無法開啟檔案 %s\n"
 
-#: libsylph/mbox.c:300
+#: libsylph/mbox.c:298
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "如果可以，請使用「flock」替代「file」。\n"
 
-#: libsylph/mbox.c:312
+#: libsylph/mbox.c:310
 #, c-format
 msgid "can't create %s\n"
 msgstr "無法產生 %s\n"
 
-#: libsylph/mbox.c:318
+#: libsylph/mbox.c:316
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "信箱正被其他的行程讀取中, 請稍候...\n"
 
-#: libsylph/mbox.c:347
+#: libsylph/mbox.c:345
 #, c-format
 msgid "can't lock %s\n"
 msgstr "無法鎖住 %s\n"
 
-#: libsylph/mbox.c:354 libsylph/mbox.c:404
+#: libsylph/mbox.c:352 libsylph/mbox.c:402
 msgid "invalid lock type\n"
 msgstr "不合法的 lock 型態。\n"
 
-#: libsylph/mbox.c:390
+#: libsylph/mbox.c:388
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "%s 無法打開 \n"
 
-#: libsylph/mbox.c:425
+#: libsylph/mbox.c:423
 msgid "can't truncate mailbox to zero.\n"
 msgstr "無法清除信箱。\n"
 
-#: libsylph/mbox.c:449
+#: libsylph/mbox.c:447
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "將郵件由 %s 匯出到 %s 中...\n"
@@ -511,7 +511,7 @@ msgstr "垃圾郵件資料夾"
 msgid "Junk mail filter"
 msgstr "垃圾郵件資料夾"
 
-#: libsylph/procmime.c:1144
+#: libsylph/procmime.c:1161
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): 轉碼失敗。\n"
 
@@ -1213,7 +1213,7 @@ msgstr "注意"
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:168 src/inc.c:729
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "錯誤"
 
@@ -2694,157 +2694,157 @@ msgstr "將 LDIF 檔匯入通訊錄"
 msgid "Attributes"
 msgstr "屬性"
 
-#: src/inc.c:161
+#: src/inc.c:159
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d 封新郵件"
 
-#: src/inc.c:479
+#: src/inc.c:477
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "認證中..."
 
-#: src/inc.c:505
+#: src/inc.c:503
 msgid "Retrieving new messages"
 msgstr "取得新郵件中"
 
-#: src/inc.c:548
+#: src/inc.c:546
 msgid "Standby"
 msgstr "等待處理中"
 
-#: src/inc.c:685 src/inc.c:735
+#: src/inc.c:683 src/inc.c:733
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/inc.c:696
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr "讀取中"
 
-#: src/inc.c:705 src/inc.c:1015
+#: src/inc.c:703 src/inc.c:1013
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "完成 （已接收 %d 封郵件 (%s)）"
 
-#: src/inc.c:709
+#: src/inc.c:707
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "沒有新郵件。"
 
-#: src/inc.c:710
+#: src/inc.c:708
 #, fuzzy
 msgid "Done"
 msgstr "完成"
 
-#: src/inc.c:715
+#: src/inc.c:713
 msgid "Connection failed"
 msgstr "連線失敗。"
 
-#: src/inc.c:718
+#: src/inc.c:716
 msgid "Auth failed"
 msgstr "認證失敗"
 
-#: src/inc.c:722
+#: src/inc.c:720
 msgid "Locked"
 msgstr "已鎖定"
 
-#: src/inc.c:732
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "逾時"
 
-#: src/inc.c:782
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完成（%d 封新郵件）"
 
-#: src/inc.c:785
+#: src/inc.c:783
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "完成（無新郵件）"
 
-#: src/inc.c:794
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "取得郵件時發生錯誤。"
 
-#: src/inc.c:828
+#: src/inc.c:826
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "取得 %s 的新郵件中, 請稍候...\n"
 
-#: src/inc.c:832
+#: src/inc.c:830
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "認證中..."
 
-#: src/inc.c:835
+#: src/inc.c:833
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 取得新郵件中, 請稍候..."
 
-#: src/inc.c:840
+#: src/inc.c:838
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "連線到 POP3 伺服器 %s 中..."
 
-#: src/inc.c:854
+#: src/inc.c:852
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "無法連線到 POP3 伺服器：%s:%d\n"
 
-#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
+#: src/inc.c:932 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "認證"
 
-#: src/inc.c:935
+#: src/inc.c:933
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "從 %s 中取得郵件中..."
 
-#: src/inc.c:940
+#: src/inc.c:938
 msgid "Getting the number of new messages (STAT)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:944
+#: src/inc.c:942
 msgid "Getting the number of new messages (LAST)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:948
+#: src/inc.c:946
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:952
+#: src/inc.c:950
 msgid "Getting the size of messages (LIST)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:962
+#: src/inc.c:960
 #, c-format
 msgid "Deleting message %d"
 msgstr "刪除第 %d 號郵件"
 
-#: src/inc.c:969 src/send_message.c:831
+#: src/inc.c:967 src/send_message.c:831
 msgid "Quitting"
 msgstr "離開"
 
-#: src/inc.c:994
+#: src/inc.c:992
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "取得新郵件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
+#: src/inc.c:1201 src/inc.c:1221 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1276
+#: src/inc.c:1274
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: src/inc.c:1282
+#: src/inc.c:1280
 msgid "Error occurred while processing mail."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/inc.c:1287
+#: src/inc.c:1285
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2853,40 +2853,40 @@ msgstr ""
 "處理郵件時發生錯誤：\n"
 "%s"
 
-#: src/inc.c:1293
+#: src/inc.c:1291
 msgid "No disk space left."
 msgstr "磁碟空間已滿。"
 
-#: src/inc.c:1298
+#: src/inc.c:1296
 msgid "Can't write file."
 msgstr "無法寫入檔案。"
 
-#: src/inc.c:1303
+#: src/inc.c:1301
 msgid "Socket error."
 msgstr "Socket 有錯誤"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
+#: src/inc.c:1307 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:760
 #: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "遠端主機關閉連線。"
 
-#: src/inc.c:1315
+#: src/inc.c:1313
 msgid "Mailbox is locked."
 msgstr "信箱已被鎖定，可能前一次擷取未完成。"
 
-#: src/inc.c:1319
+#: src/inc.c:1317
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "信箱已被鎖定：%s"
 
-#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
+#: src/inc.c:1323 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "認證失敗"
 
-#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
+#: src/inc.c:1328 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2895,15 +2895,15 @@ msgstr ""
 "認證失敗：\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
+#: src/inc.c:1333 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "作業逾時"
 
-#: src/inc.c:1376
+#: src/inc.c:1374
 msgid "Incorporation cancelled\n"
 msgstr "動作已取消\n"
 
-#: src/inc.c:1478
+#: src/inc.c:1476
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "從 %s 中取得郵件放入 %s...\n"