added menu to the remote POP3 mailbox window.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2068 ee746299-78ed-0310-b773-934348b2243d
author: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2008-11-14 04:44:06 +0000
committer: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2008-11-14 04:44:06 +0000
commit: 83ee9999035fcf1e83ac545c0b6380c2b2678a77 (patch)
tree: e7a4a0b6c3fcd35b6179cb60fb346a3b0a1f8e87 /po
parent: 38116a68e113c4234a792513ee42072f1143ded3 (diff)
30 files changed, 1491 insertions, 1120 deletions
diff --git a/po/be.po b/po/be.po
index d89157d2..6a93918c 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+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"
@@ -1583,7 +1583,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Нельга атрымаць частку састаўнога паведамлення."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Без Тэмы)"
 
@@ -1774,7 +1774,7 @@ msgstr "тып MIME"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Памер"
@@ -2483,7 +2483,7 @@ msgstr "Групы навін:"
 msgid "Creating header view...\n"
 msgstr "Стварэнне прагляду загалоўкаў...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Без Адпраўніка)"
@@ -2760,7 +2760,7 @@ msgstr "Злучэнне з POP3 серверам: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Нельга злучыцца з серверам POP3: %s:%d\n"
 
-#: src/inc.c:934 src/rpop3.c:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Аўтэнтыфікацыя..."
@@ -2838,7 +2838,7 @@ msgid "Socket error."
 msgstr "Памылка сокету."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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 "Злучэнне закрытае аддаленым серверам."
@@ -2856,11 +2856,11 @@ msgstr ""
 "Паштовая скрыня замкнутая:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Аўтэнтыфікацыя схібіла."
 
-#: src/inc.c:1330 src/rpop3.c:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2869,7 +2869,7 @@ msgstr ""
 "Аўтэнтыфікацыя схібіла:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Таймаут сеансу."
 
@@ -5928,19 +5928,19 @@ msgid "Attachment"
 msgstr "Дадатак"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Тэма"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Ад"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Дата"
@@ -6252,7 +6252,7 @@ msgstr "Пошук %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Пошук %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Без Даты)"
 
@@ -6314,94 +6314,109 @@ msgstr "Подпіс зроблены %s\n"
 msgid "Error verifying the signature"
 msgstr "Памылка праверкі подпісу"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/Ф_айл"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Атрымаць"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/Даведка"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "Аб праграме"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Выдаліць скрыню"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "Не."
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Атрымаць"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Злучэнне з SMTP серверам: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Нельга злучыцца з серверам POP3: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "памылка здарылася падчас сеансу POP3\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "памылка здарылася падчас сеансу POP3\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Атрыманне загалоўкаў паведамлення (%d / %d)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Атрыманне колькасці новых паведамленняў (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Няма новых паведамленняў."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Выдаліць паведамленне(і)"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Адлучэнне..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Атрыманне новых паведамленняў"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Адправіць паведамленне"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Атрыманне новых паведамленняў"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Атрыманне паведамленняў з %s..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Выдаліць паведамленне(і)"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/bg.po b/po/bg.po
index 082b41ef..10bdc266 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+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"
@@ -1640,7 +1640,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Няма Тема)"
 
@@ -1831,7 +1831,7 @@ msgstr "MIME тип"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Размер"
@@ -2556,7 +2556,7 @@ msgstr "Новинарски групи:"
 msgid "Creating header view...\n"
 msgstr "Създаване изглед на заглавните блокове...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Няма От)"
@@ -2843,7 +2843,7 @@ msgstr "Свързване с POP3 сървър: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не може да се установи връзка с POP3 сървър: %s:%d\n"
 
-#: src/inc.c:934 src/rpop3.c:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Удостоверяване..."
@@ -2919,7 +2919,7 @@ msgid "Socket error."
 msgstr "Грешка в сокет."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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 "Връзката е прекратена от отдалечения хост."
@@ -2937,11 +2937,11 @@ msgstr ""
 "Пощенската кутия е заключена:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Удостоверяването се провали."
 
-#: src/inc.c:1330 src/rpop3.c:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2950,7 +2950,7 @@ msgstr ""
 "Удостоверяването се провали:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 #, fuzzy
 msgid "Session timed out."
 msgstr "сесията е просрочена\n"
@@ -6130,19 +6130,19 @@ msgid "Attachment"
 msgstr "Притурка"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Подател"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Дата"
@@ -6471,7 +6471,7 @@ msgstr "Сканиране на папка %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Филтриране..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Няма Дата)"
 
@@ -6539,94 +6539,109 @@ msgstr "Подписът е направен на %s\n"
 msgid "Error verifying the signature"
 msgstr "Грешка при проверяване на подписът"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_Файл"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Получаване"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/_Помощ"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "Относно"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Премахване на пощенска кутия"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "No."
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Получаване"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Свързване с SMTP сървър: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Не може да се установи връзка с POP3 сървър: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "грешка при POP3 сесията\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "грешка при POP3 сесията\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Изпращане на съобщение (%d / %d байта)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Взимане на броят на нови съобщения (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Няма нови съобщения."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Изтриване на съобщение(я)"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Прекъсване..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Получаване на нови съобщения"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Изпращане на съобщение"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Получаване на нови съобщения"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Получаване на съобщения от %s..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Изтриване на съобщение(я)"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -7443,10 +7458,6 @@ msgstr "Стар Sylpheed"
 #~ msgstr "SSL връзката се провали (%s)\n"
 
 #, fuzzy
-#~ msgid "_About"
-#~ msgstr "Относно"
-
-#, fuzzy
 #~ msgid "/_View/Show all _headers"
 #~ msgstr "/_Изглед/_Показване на заглавните части(headers)"
 
diff --git a/po/cs.po b/po/cs.po
index 9054822f..54f53dd7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+0900\n"
 "PO-Revision-Date: 2008-05-16 23:22+0100\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Petr Kovar <pknbe@volny.cz>\n"
@@ -1586,7 +1586,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Nelze získat část ze zprávy s více částmi."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Bez předmětu)"
 
@@ -1777,7 +1777,7 @@ msgstr "Typ MIME"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Velikost"
@@ -2487,7 +2487,7 @@ msgstr "Diskusní skupiny:"
 msgid "Creating header view...\n"
 msgstr "Vytváří se náhled záhlaví...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(není znám odesílatel)"
@@ -2764,7 +2764,7 @@ msgstr "Připojování k serveru POP3: %s..."
 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:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentizace..."
@@ -2842,7 +2842,7 @@ msgid "Socket error."
 msgstr "Chyba socketu."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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."
@@ -2860,11 +2860,11 @@ msgstr ""
 "Poštovní schránka je zamčena:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 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:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2873,7 +2873,7 @@ msgstr ""
 "Autentizace selhala:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Vypršel čas relace."
 
@@ -5937,19 +5937,19 @@ msgid "Attachment"
 msgstr "Příloha"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Předmět"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Odesílatel"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Datum"
@@ -6261,7 +6261,7 @@ msgstr "Prohledává se %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Prohledává se %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Bez data)"
 
@@ -6323,94 +6323,109 @@ msgstr "Podpis vytvořen v: %s\n"
 msgid "Error verifying the signature"
 msgstr "Chyba při ověřování podpisu"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_Soubor"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Přijmout"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/Nápo_věda"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "O aplikaci"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Odstranit poštovní schránku"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "Č."
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Přijmout"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Připojování k serveru SMTP: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Nelze se spojit se serverem POP3: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "v relaci POP3 se vyskytla chyba\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "v relaci POP3 se vyskytla chyba\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Přijímá se záhlaví zprávy (%d / %d)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Zjišťuje se počet nových zpráv (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Žádné nové zprávy."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Smazat zprávy"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Ukončování..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Přijímají se nové zprávy"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Odešle zprávu"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Přijímají se nové zprávy"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Přijímají se zprávy z %s..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Smazat zprávy"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/da.po b/po/da.po
index a498d756..9f1dbda8 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -1638,7 +1638,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Intet emne)"
 
@@ -1829,7 +1829,7 @@ msgstr "MIME type"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Størrelse"
@@ -2555,7 +2555,7 @@ msgstr "Nyhedsgrupper:"
 msgid "Creating header view...\n"
 msgstr "Opretter hoved visning...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Ingen Fra)"
@@ -2841,7 +2841,7 @@ msgstr "Forbinder til POP3 server: %s ..."
 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:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Godkender..."
@@ -2921,7 +2921,7 @@ msgid "Socket error."
 msgstr "Sokkel fejl."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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 ""
@@ -2940,11 +2940,11 @@ msgstr ""
 "Mailbox er låst:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 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:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2953,7 +2953,7 @@ msgstr ""
 "Godkendelsesfejl:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 #, fuzzy
 msgid "Session timed out."
 msgstr "tid udløbet\n"
@@ -6127,19 +6127,19 @@ msgid "Attachment"
 msgstr "Vedhæftet"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Emne"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Fra"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Dato"
@@ -6466,7 +6466,7 @@ msgstr "Gennemsøger mappe %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrering..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Ingen dato)"
 
@@ -6535,94 +6535,109 @@ msgstr "Underskrift fra %s\n"
 msgid "Error verifying the signature"
 msgstr "Fejl ved verificering af underskrift"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_Filer"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Hent"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/_Hjælp"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "Om"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Slet mappe"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "Nr."
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Hent"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Forbindelse med SMTP server: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Ingen forbindelse med POP3 server: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "fejl under POP3 session\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "fejl under POP3 session\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Sender meddelelse (%d / %d bytes)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Modtager antal nye meddelelser (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Ingen nye meddelelser."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Slet meddelelse(er)"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Afslutter..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Modtager nu meddelelse"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Sende meddelelse"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Modtager nu meddelelse"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Modtager meddelelse fra %s..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Slet meddelelse(er)"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -7448,10 +7463,6 @@ msgstr "Gl. Sylpheed"
 #~ msgstr "SSL forbindelse fejlet (%s)\n"
 
 #, fuzzy
-#~ msgid "_About"
-#~ msgstr "Om"
-
-#, fuzzy
 #~ msgid "/_View/Show all _headers"
 #~ msgstr "/_Vis/_Alle hoved linier"
 
diff --git a/po/de.po b/po/de.po
index ffcd4e91..d5bb65da 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+0900\n"
 "PO-Revision-Date: 2007-09-29 23:16+0100\n"
 "Last-Translator: Joo Martin <debian@joomart.de>\n"
 "Language-Team: de\n"
@@ -1591,7 +1591,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht bekommen."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
@@ -1787,7 +1787,7 @@ msgstr "MIME-Typ"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Größe"
@@ -2496,7 +2496,7 @@ msgstr "Newsgroups:"
 msgid "Creating header view...\n"
 msgstr "Erzeuge Kopfzeilenansicht...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Kein Von)"
@@ -2774,7 +2774,7 @@ msgstr "Verbinde mit POP3-Server: %s..."
 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:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Beglaubigen..."
@@ -2852,7 +2852,7 @@ msgid "Socket error."
 msgstr "Socket-Fehler."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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."
@@ -2870,11 +2870,11 @@ msgstr ""
 "Mailbox ist gesperrt:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 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:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2883,7 +2883,7 @@ msgstr ""
 "Beglaubigung fehlgeschlagen:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Sitzungszeit abgelaufen."
 
@@ -5962,19 +5962,19 @@ msgid "Attachment"
 msgstr "Anhang"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Betreff"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Von"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Datum"
@@ -6287,7 +6287,7 @@ msgstr "Suche %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Suche %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Kein Datum)"
 
@@ -6349,94 +6349,108 @@ msgstr "Digitale Unterschrift erstellt %s\n"
 msgid "Error verifying the signature"
 msgstr "Fehler beim Verifizieren der digitalen Unterschrift"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_Datei"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Holen"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/_Hilfe"
+
+#: src/rpop3.c:249
+msgid "_About"
+msgstr "_Über"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Entferne Mailbox"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "Nr."
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Holen"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Verbindung mit SMTP-Server: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Keine Verbindung mit POP3-Server: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "Fehler während einer POP3-Sitzung\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "Fehler während einer POP3-Sitzung\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Hole Nachrichtenkopfzeilen (%d / %d bytes)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Keine neuen Nachrichten."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Nachricht(en) löschen"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Beende..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Empfange neue Nachricht"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Sende Nachricht"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Empfange neue Nachricht"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Erhaltene Nachrichten von %s..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Nachricht(en) löschen"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -7262,9 +7276,6 @@ msgstr "Sylpheed"
 #~ msgid "SSL connect failed (%s)\n"
 #~ msgstr "SSL-Verbindung fehlgeschlagen (%s)\n"
 
-#~ msgid "_About"
-#~ msgstr "_Über"
-
 #~ msgid "/_View/Show all _headers"
 #~ msgstr "/_Ansicht/Zeige alle _Kopfzeilen"
 
diff --git a/po/el.po b/po/el.po
index ad332b21..9a830fd8 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+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"
@@ -1621,7 +1621,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Δεν είναι δυνατή η λήψη μέρους του πολυτμηματικού μηνύματος."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Χωρίς θέμα)"
 
@@ -1821,7 +1821,7 @@ msgstr "τύπος MIME"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Μέγεθος"
@@ -2542,7 +2542,7 @@ msgstr "Ομάδες συζητήσεων:"
 msgid "Creating header view...\n"
 msgstr "Δημιουργία προβολής κεφαλίδων...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Χωρίς αποστολέα)"
@@ -2830,7 +2830,7 @@ msgstr "Σύνδεση με το διακομιστή POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Δεν μπορώ να συνδεθώ στον POP3 server: %s:%d\n"
 
-#: src/inc.c:934 src/rpop3.c:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Πιστοποίηση..."
@@ -2906,7 +2906,7 @@ msgid "Socket error."
 msgstr "Σφάλμα σύνδεσης."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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 "Η σύνδεση έκλεισε από τον απομακρυσμένο υπολογιστή."
@@ -2924,11 +2924,11 @@ msgstr ""
 "Το γραμματοκιβώτιο είναι κλειδωμένο:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Η πιστοποίηση απέτυχε."
 
-#: src/inc.c:1330 src/rpop3.c:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2937,7 +2937,7 @@ msgstr ""
 "Η πιστοποίηση απέτυχε:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Λήξη χρόνου σύνδεσης."
 
@@ -6026,19 +6026,19 @@ msgid "Attachment"
 msgstr "Συνημμένο"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Θέμα"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Από"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Ημερομηνία"
@@ -6353,7 +6353,7 @@ msgstr "Αναζήτηση για %s..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Αναζήτηση για %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Χωρίς ημερομηνία)"
 
@@ -6418,94 +6418,108 @@ msgstr "Υπογραφή δημιουργήθηκε στο %s\n"
 msgid "Error verifying the signature"
 msgstr "Σφάλμα επιβεβαίωσης υπογραφής"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_Αρχείο"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Λήψη"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/_Βοήθεια"
+
+#: src/rpop3.c:249
+msgid "_About"
+msgstr "_Σχετικά"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Αφαίρεση γραμματοκιβωτίου"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "Όχι."
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Λήψη"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Σύνδεση στην εξυπηρέτη SMTP: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Δεν μπορώ να συνδεθώ στον POP3 server: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "Προέκυψε σφάλμα στη συνεδρία POP3\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "Προέκυψε σφάλμα στη συνεδρία POP3\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Εμφάνιση Όλων των _Κεφαλίδων"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Λήψη αριθμού νέων μηνυμάτων (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Δεν υπάρχουν νέα μηνύματα."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Διαγραφή μηνύματος(ων)"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Εγκατάλειψη..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Λήψη νέων μηνυμάτων"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Αποστολή μηνύματος"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Λήψη νέων μηνυμάτων"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Λήψη μηνυμάτων από %s..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Διαγραφή μηνύματος(ων)"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -7309,6 +7323,3 @@ msgstr "Sylpheed"
 
 #~ msgid "/_View/_Source"
 #~ msgstr "/Προ_βολή/Πηγαίου _κώδικα"
-
-#~ msgid "_About"
-#~ msgstr "_Σχετικά"
diff --git a/po/es.po b/po/es.po
index 9ec064d5..018fe8bb 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+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"
@@ -1588,7 +1588,7 @@ msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
@@ -1780,7 +1780,7 @@ msgstr "Tipo MIME"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Tamaño"
@@ -2491,7 +2491,7 @@ msgstr "Grupos de noticias:"
 msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceras...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Sin remitente)"
@@ -2768,7 +2768,7 @@ msgstr "Conectando al servidor POP3: %s..."
 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:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentificando..."
@@ -2846,7 +2846,7 @@ msgid "Socket error."
 msgstr "Error de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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."
@@ -2864,11 +2864,11 @@ msgstr ""
 "El buzón está bloqueado:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 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:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2877,7 +2877,7 @@ msgstr ""
 "La autentificación falló:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 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."
 
@@ -5939,19 +5939,19 @@ msgid "Attachment"
 msgstr "Adjunto"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Desde"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Fecha"
@@ -6263,7 +6263,7 @@ msgstr "Buscando %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Buscando %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Sin fecha)"
 
@@ -6325,94 +6325,109 @@ msgstr "Firma hecha en %s\n"
 msgid "Error verifying the signature"
 msgstr "Error al verificar la firma"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_Fichero"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Recibir"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/_Ayuda"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "Acerca de"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "No."
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Recibir"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Conectando con el servidor SMTP: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "No se puede conectar al servidor POP3: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "hubo algún error en la sesión POP3\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "hubo algún error en la sesión POP3\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Obteniendo las cabeceras de mensaje (%d / %d)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Obteniendo el número de nuevos mensajes (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "No hay mensajes nuevos."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Borrar mensaje(s)"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Terminando..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Obteniendo nuevos mensajes"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Enviar mensaje"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Obteniendo nuevos mensajes"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Obteniendo mensajes desde %s..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Borrar mensaje(s)"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/et.po b/po/et.po
index 8b1c5f03..b493d830 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+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"
@@ -1646,7 +1646,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Pole pealkirja)"
 
@@ -1837,7 +1837,7 @@ msgstr "MIME tüüp"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Suurus"
@@ -2567,7 +2567,7 @@ msgstr "Uudistegrupid:"
 msgid "Creating header view...\n"
 msgstr "Loon päise vaadet...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Eikelleltki)"
@@ -2853,7 +2853,7 @@ msgstr "Ühendan POP3 serveriga: %s ..."
 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:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Autoriseerin..."
@@ -2930,7 +2930,7 @@ msgid "Socket error."
 msgstr "Soketi viga\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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 ""
@@ -2946,19 +2946,19 @@ msgid ""
 "%s"
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 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:444 src/send_message.c:949
+#: src/inc.c:1330 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:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr ""
 
@@ -6133,19 +6133,19 @@ msgid "Attachment"
 msgstr "Manus"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Pealkiri"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Kellelt"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Kuupäev"
@@ -6472,7 +6472,7 @@ msgstr "Tuhnin kaustas %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtreerin..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Kuupäeva pole)"
 
@@ -6541,94 +6541,109 @@ msgstr "Allkiri %s\n"
 msgid "Error verifying the signature"
 msgstr "Viga allkirja kontrollimisel"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_Fail"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Võta"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/_Abi"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "Sellest"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Eemalda kirjakst"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "Ei."
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Võta"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Ühendun SMTP serveriga: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Ei suuda ühenduda POP3 serveriga %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "autoriseerimisel tekkis viga\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "autoriseerimisel tekkis viga\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Saadan kirja (%d / %d baiti)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Uusi kirju ei ole."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Kustuta kirjad"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Väljun..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Võtan uusi kirju"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Saada kiri"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Võtan uusi kirju"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Kustuta kirjad"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -7447,10 +7462,6 @@ msgstr "Vana Sylpheed"
 #~ msgstr "Ühendamine SSL-iga ebaõnnestus (%s)\n"
 
 #, fuzzy
-#~ msgid "_About"
-#~ msgstr "Sellest"
-
-#, fuzzy
 #~ msgid "/_View/Show all _headers"
 #~ msgstr "/_Vaade/Näita ko_gu päist"
 
diff --git a/po/fr.po b/po/fr.po
index 7cda49c6..b2b28842 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+0900\n"
 "PO-Revision-Date: 2008-06-06 13:42+0200\n"
 "Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -1606,7 +1606,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
@@ -1796,7 +1796,7 @@ msgstr "Type MIME"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Taille"
@@ -2511,7 +2511,7 @@ msgstr "Groupe de discussion :"
 msgid "Creating header view...\n"
 msgstr "Création de la vue des en-têtes...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Pas d'expéditeur)"
@@ -2791,7 +2791,7 @@ msgstr "Connexion au serveur POP3 : %s..."
 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:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Authentification..."
@@ -2869,7 +2869,7 @@ msgid "Socket error."
 msgstr "Erreur de protocole."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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."
@@ -2887,11 +2887,11 @@ msgstr ""
 "Boîte verrouillée :\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 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:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2900,7 +2900,7 @@ msgstr ""
 "L'authentification a échoué :\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 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."
 
@@ -5990,19 +5990,19 @@ msgid "Attachment"
 msgstr "Pièces jointes"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Sujet"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Expéditeur"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Date"
@@ -6316,7 +6316,7 @@ msgstr "Recherche %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Recherche %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(aucune date)"
 
@@ -6378,94 +6378,109 @@ msgstr "Date de la signature : %s\n"
 msgid "Error verifying the signature"
 msgstr "Erreur lors de la vérification de la signature"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_Fichier"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Relever"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/A_ide"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "À propos"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Suppression d'une boîte aux lettres"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "N°"
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Relever"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Connection au serveur SMTP : %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Impossible de se connecter au serveur POP3 : %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: 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"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "une erreur est survenue pendant la session POP3\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Réception des en-têtes de message (%d / %d)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Récupération du nombre de nouveaux messages (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Pas de nouveaux messages."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Suppression de message(s)"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Fermeture..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Récupération des nouveaux messages"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Envoyer le message"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Récupération des nouveaux messages"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Réception des messages de %s..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Suppression de message(s)"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/gl.po b/po/gl.po
index eae43c60..3b2430c1 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -1645,7 +1645,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Non se pode obter a parte do mensaxe multipartes."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
@@ -1836,7 +1836,7 @@ msgstr "Tipo MIME"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Tamaño"
@@ -2563,7 +2563,7 @@ msgstr "Grupos de novas:"
 msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceiras...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Sin remite)"
@@ -2850,7 +2850,7 @@ msgstr "Conectando ó servidor POP3: %s ..."
 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:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Autenticando..."
@@ -2927,7 +2927,7 @@ msgid "Socket error."
 msgstr "Error de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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 ""
@@ -2945,12 +2945,12 @@ msgstr ""
 "a caixa de correo esta bloqueada:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 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:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2959,7 +2959,7 @@ msgstr ""
 "Fallo de autenticación:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr ""
 
@@ -6132,19 +6132,19 @@ msgid "Attachment"
 msgstr "Adxunto"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Dende"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Data"
@@ -6471,7 +6471,7 @@ msgstr "Revisando carpeta %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Sin data)"
 
@@ -6539,94 +6539,109 @@ msgstr "Sinatura feita en %s\n"
 msgid "Error verifying the signature"
 msgstr "Error ó verificar a sinatura"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_Ficheiro"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Traer"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/_Axuda"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "Acerca de"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "Non."
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Traer"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Conectando con o servidor SMTP: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Non se pode conectar ó servirdor POP3: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "ocurriu algún erro na sesión POP3\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "ocurriu algún erro na sesión POP3\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Enviando mensaxe (%d / %d bytes)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Obtendo o número de novas mensaxes (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Non hai mensaxes novas."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Borrar mensaxe(s)"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Terminando..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Obtendo novos mensaxes"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Enviar Mensaxe"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Obtendo novos mensaxes"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Borrar mensaxe(s)"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -7447,10 +7462,6 @@ msgstr "Antigos de Sylpheed"
 #~ msgstr "Conexión SSL fallida (%s)\n"
 
 #, fuzzy
-#~ msgid "_About"
-#~ msgstr "Acerca de"
-
-#, fuzzy
 #~ msgid "/_View/Show all _headers"
 #~ msgstr "/_Ver/Mostrar todas as cabeceiras"
 
diff --git a/po/hr.po b/po/hr.po
index f86d6d1c..92efea72 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+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"
@@ -1653,7 +1653,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedjelne poruke."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
@@ -1842,7 +1842,7 @@ msgstr "MIME tip"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Veličina"
@@ -2578,7 +2578,7 @@ msgstr "News grupe:"
 msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Bez pošiljatelja)"
@@ -2876,7 +2876,7 @@ msgstr "Povezujem se na POP3 poslužitelj: %s ..."
 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:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
@@ -2953,7 +2953,7 @@ msgid "Socket error."
 msgstr "protokol greška\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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 ""
@@ -2970,19 +2970,19 @@ msgid ""
 "%s"
 msgstr "Postavke sandučića"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 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:444 src/send_message.c:949
+#: src/inc.c:1330 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:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr ""
 
@@ -6221,19 +6221,19 @@ msgid "Attachment"
 msgstr "Prilog"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Datum"
@@ -6563,7 +6563,7 @@ msgstr "Pretražujem spis %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
@@ -6632,94 +6632,109 @@ msgstr "Potpis napravio/la %s\n"
 msgid "Error verifying the signature"
 msgstr "Greška pri potvrđivanju potpisa"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_Datoteka"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Primi"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/_Pomoć"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "O"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "/_Ukloni sandučić"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "Ne."
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Primi"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Spajam se na SMTP poslužitelj: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Ne mogu se povezati na POP3 poslužitelj: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "greška prilikom ovjeravanja\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "greška prilikom ovjeravanja\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Šaljem poruku (%d / %d bytea)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Primam broj novih poruka (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Nema nepročitanih poruka."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Obriši poruku/e"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Završavam..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Primam nove poruke"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Pošalji poruku"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Primam nove poruke"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Obriši poruku/e"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -7551,10 +7566,6 @@ msgstr ""
 #~ msgstr "SSL veza propala (%s)\n"
 
 #, fuzzy
-#~ msgid "_About"
-#~ msgstr "O"
-
-#, fuzzy
 #~ msgid "/_View/Show all _headers"
 #~ msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
diff --git a/po/hu.po b/po/hu.po
index 613c6855..36dfb7b9 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+0900\n"
 "PO-Revision-Date: 2008-05-25 20:14+0200\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: HUNGARIAN <NONE>\n"
@@ -1588,7 +1588,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Egy több részes levél egy darabja nem hozzáférhető."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
 
@@ -1780,7 +1780,7 @@ msgstr "MIME típus"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Méret"
@@ -2489,7 +2489,7 @@ msgstr "Hírcsoportok:"
 msgid "Creating header view...\n"
 msgstr "Fejléc nézet létrehozása...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Nincs Feladó)"
@@ -2766,7 +2766,7 @@ msgstr "Kapcsolódás a(z) %s POP3 szerverhez ..."
 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:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Azonosítás..."
@@ -2844,7 +2844,7 @@ msgid "Socket error."
 msgstr "Socket hiba."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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."
@@ -2862,11 +2862,11 @@ msgstr ""
 "A postafiók zárolt:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 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:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2875,7 +2875,7 @@ msgstr ""
 "Az azonosítás nem sikerült:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Menet időtúllépése."
 
@@ -5943,19 +5943,19 @@ msgid "Attachment"
 msgstr "Csatolás"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Tárgy"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Feladó"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Dátum"
@@ -6267,7 +6267,7 @@ msgstr "%s keresése..."
 msgid "Searching %s (%d / %d)..."
 msgstr "%s keresése (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Nincs Dátum)"
 
@@ -6329,94 +6329,109 @@ msgstr "Az aláírás készült %s\n"
 msgid "Error verifying the signature"
 msgstr "Hiba az aláírás ellenőrzése közben"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_Fájl"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Fogadás"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/_Súgó"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "Névjegy"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Postaláda eltávolítása"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "Db"
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Fogadás"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Kapcsolódás %s SMTP szerverhez..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Nem sikerült kapcsolódni a POP3 szerverhez: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: 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"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "hiba történt a POP3 kapcsolat közben\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Levélfejlécek letöltése (%d / %d)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Új levelek számának megszerzése (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Nincs új levél."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Levél(ek) törlése"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Kilépés..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Új levelek fogadása"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Levél küldése"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Új levelek fogadása"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Levelek fogadása innen: %s ..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Levél(ek) törlése"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/it.po b/po/it.po
index 38a4e69d..c286de1a 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+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"
@@ -1591,7 +1591,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Nessun oggetto)"
 
@@ -1791,7 +1791,7 @@ msgstr "Tipo MIME"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Dimensione"
@@ -2503,7 +2503,7 @@ msgstr "Newsgroup:"
 msgid "Creating header view...\n"
 msgstr "Creazione della vista dell'intestazione...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Nessun mittente)"
@@ -2780,7 +2780,7 @@ msgstr "Connessione al server POP3: %s..."
 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:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Autenticazione..."
@@ -2858,7 +2858,7 @@ msgid "Socket error."
 msgstr "Errore del socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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."
@@ -2876,11 +2876,11 @@ msgstr ""
 "La casella postale è bloccata:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 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:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2889,7 +2889,7 @@ msgstr ""
 "Autenticazione fallita:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "La sessione è andata in timeout."
 
@@ -5965,19 +5965,19 @@ msgid "Attachment"
 msgstr "Allegato"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Oggetto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Da"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Data"
@@ -6290,7 +6290,7 @@ msgstr "Ricerca in %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Ricerca in %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Nessuna Data)"
 
@@ -6352,94 +6352,109 @@ msgstr "Firma fatta a %s\n"
 msgid "Error verifying the signature"
 msgstr "Errore verificando la firma"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_File"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Ricevi"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/A_iuto"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "Informazioni"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Rimuovi la casella postale"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "No."
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Ricevi"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Connessione al server SMTP: %s..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Impossibile connettersi al server POP3: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "si è verificato un errore durante la sessione POP3\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "si è verificato un errore durante la sessione POP3\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Ricezione intestazioni del messaggio (%d / %d)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Ricezione del numero dei nuovi messaggi (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Non esistono messaggi nuovi."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Elimina il(i) messaggio(i)"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Esco..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Recupero i nuovi messaggi"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Invia il messaggio"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Recupero i nuovi messaggi"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Ricezione dei messaggi da %s..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Elimina il(i) messaggio(i)"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/ja.po b/po/ja.po
index 299f368d..d137605f 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+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"
@@ -1586,7 +1586,7 @@ msgid "Can't get the part of multipart message."
 msgstr "マルチパートメッセージのパートを取得できません。"
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(件名なし)"
 
@@ -1776,7 +1776,7 @@ msgstr "MIME タイプ"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "サイズ"
@@ -2485,7 +2485,7 @@ msgstr "ニュースグループ:"
 msgid "Creating header view...\n"
 msgstr "ヘッダビューを作成中...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(差出人不明)"
@@ -2761,7 +2761,7 @@ msgstr "POP3サーバ: %s に接続中..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3サーバ: %s:%d に接続できません\n"
 
-#: src/inc.c:934 src/rpop3.c:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "認証中..."
@@ -2839,7 +2839,7 @@ msgid "Socket error."
 msgstr "ソケットエラーです。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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 "リモートホストによって接続を切断されました。"
@@ -2857,11 +2857,11 @@ msgstr ""
 "メールボックスはロックされています:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "認証に失敗しました。"
 
-#: src/inc.c:1330 src/rpop3.c:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2870,7 +2870,7 @@ msgstr ""
 "認証に失敗しました:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "セッションがタイムアウトしました。"
 
@@ -5925,19 +5925,19 @@ msgid "Attachment"
 msgstr "添付"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "件名"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "差出人"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "日付"
@@ -6246,7 +6246,7 @@ msgstr "%s を検索中..."
 msgid "Searching %s (%d / %d)..."
 msgstr "%s を検索中 (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(日付なし)"
 
@@ -6308,34 +6308,46 @@ msgstr "署名の作成時刻 %s\n"
 msgid "Error verifying the signature"
 msgstr "署名検証エラー"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+msgid "_File"
+msgstr "ファイル(_F)"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+msgid "_Get"
+msgstr "受信(_G)"
+
+#: src/rpop3.c:248
+msgid "_Help"
+msgstr "ヘルプ(_H)"
+
+#: src/rpop3.c:249
+msgid "_About"
+msgstr "このプログラムについて(_A)"
+
+#: src/rpop3.c:338
 #, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - POP3 リモートメールボックス"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "番号"
 
-#: src/rpop3.c:371
-msgid "_Get"
-msgstr "受信(_G)"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "%s:%d に接続中..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "POP3サーバ: %s:%d に接続できません"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 msgid "Error occurred during POP3 session."
 msgstr "POP3 セッション中にエラーが発生しました。"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
@@ -6344,55 +6356,55 @@ msgstr ""
 "POP3 セッション中にエラーが発生しました:\n"
 "%s"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "メッセージのヘッダを取得中 (%d / %d) ..."
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 msgid "Getting the number of messages..."
 msgstr "メッセージの件数を取得中..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 msgid "No message"
 msgstr "メッセージがありません"
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, c-format
 msgid "Deleted %d messages"
 msgstr "%d 通のメッセージを削除しました"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "切断中..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, c-format
 msgid "Retrieved %d messages"
 msgstr "%d 通のメッセージを取得しました"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, c-format
 msgid "Opened message %d"
 msgstr "メッセージ %d を開きました"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, c-format
 msgid "Retrieved %d message headers"
 msgstr "%d 件のメッセージのヘッダを取得しました"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, c-format
 msgid "Retrieving message %d ..."
 msgstr "メッセージ %d を取得中..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 msgid "Delete messages"
 msgstr "メッセージの削除"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/ko.po b/po/ko.po
index 9234438b..975a30d9 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+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"
@@ -1629,7 +1629,7 @@ msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(제목 없음)"
 
@@ -1819,7 +1819,7 @@ msgstr "마임 타입"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "크기"
@@ -2546,7 +2546,7 @@ msgstr "뉴스그룹:"
 msgid "Creating header view...\n"
 msgstr "헤더 뷰를 생성합니다...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(???)"
@@ -2832,7 +2832,7 @@ msgstr "POP3 서버 %s에 연결합니다..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "%s:%d POP3 서버에 연결할 수가 없습니다\n"
 
-#: src/inc.c:934 src/rpop3.c:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "인증 중입니다..."
@@ -2907,7 +2907,7 @@ msgid "Socket error."
 msgstr "소켓 에러."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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 ""
@@ -2923,19 +2923,19 @@ msgid ""
 "%s"
 msgstr "메일박스가 잠겨있습니다."
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 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:444 src/send_message.c:949
+#: src/inc.c:1330 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:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr ""
 
@@ -6083,19 +6083,19 @@ msgid "Attachment"
 msgstr "첨부"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "제목"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "보낸 사람"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "날짜"
@@ -6415,7 +6415,7 @@ msgstr "%s 폴더를 스캔합니다..."
 msgid "Searching %s (%d / %d)..."
 msgstr "필터링..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(날짜 없슴)"
 
@@ -6483,94 +6483,109 @@ msgstr ""
 msgid "Error verifying the signature"
 msgstr "서명을 검증하는 도중 에러"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/파일(_F)"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "받기"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/도움말(_H)"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "이 프로그램은"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "메일박스를 제거합니다"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "번호"
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "받기"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "SMTP 서버에 연결하고 있습니다: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "%s:%d POP3 서버에 연결할 수가 없습니다\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "인증 도중 에러 발생\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "인증 도중 에러 발생\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "메시지를 보내는 중 (%d / %d 바이트)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "새 메시지의 갯수를 얻는 중 (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "새 메시지가 없습니다."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "메시지를 지웁니다"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "끝마치는 중..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "새 메시지를 가져옴"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "메시지 보내기"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "새 메시지를 가져옴"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "메시지를 지웁니다"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -7381,10 +7396,6 @@ msgstr "예전 Sylpheed"
 #~ msgstr "SSL 연결이 실패했습니다(%s)\n"
 
 #, fuzzy
-#~ msgid "_About"
-#~ msgstr "이 프로그램은"
-
-#, fuzzy
 #~ msgid "/_View/Show all _headers"
 #~ msgstr "/보기(_V)/모든 헤더보기(_h)"
 
diff --git a/po/lt.po b/po/lt.po
index de983f0e..9d4656ea 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+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"
@@ -1583,7 +1583,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Negaliu gauti sudėtinės laiško dalies"
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Nėra temos)"
 
@@ -1774,7 +1774,7 @@ msgstr "MIME tipas"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Dydis"
@@ -2483,7 +2483,7 @@ msgstr "Naujienų grupės"
 msgid "Creating header view...\n"
 msgstr "Sukuria antraščių peržiūra...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Nėra gavėjo)"
@@ -2760,7 +2760,7 @@ msgstr "Jungiuosi prie POP3 serverio: %s..."
 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:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Patvirtinamas autentiškumas..."
@@ -2836,7 +2836,7 @@ msgid "Socket error."
 msgstr "Socket error."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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."
@@ -2854,11 +2854,11 @@ msgstr ""
 "Dėžutė užrakinta:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 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:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2867,7 +2867,7 @@ msgstr ""
 "Nepavyko patvirtinti autentiškumo:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Baigėsi sesijos laikas."
 
@@ -5926,19 +5926,19 @@ msgid "Attachment"
 msgstr "Priedas"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Siuntėjas"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Data"
@@ -6251,7 +6251,7 @@ msgstr "Ieškoma „%s“..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Ieškoma %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Be datos)"
 
@@ -6313,94 +6313,109 @@ msgstr "Pasirašyta %s\n"
 msgid "Error verifying the signature"
 msgstr "Klaida tikrinant parašą"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_Failas"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Gauti"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/_Pagalba"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "Apie"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Pašalinti dėžutę"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "Nr."
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Gauti"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Jungiuosi prie SMTP serverio: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Negaliu prisijungti prie POP3 serverio: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "klaida POP3 sesijoje\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "klaida POP3 sesijoje\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Gaunamos laiškų antraštės (%d / %d)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Gaunamas naujų laiškų skaičius (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Nėra naujų laiškų."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Ištrinti laišką(-us)"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Išeinu..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Gaunami nauji laiškai"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Siųsti laišką"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Gaunami nauji laiškai"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Gaunami laiškai iš %s..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Ištrinti laišką(-us)"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/nl.po b/po/nl.po
index ed00d3bd..f38507df 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+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"
@@ -1609,7 +1609,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ik kan het deel van een meerdelig bericht niet ophalen."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
@@ -1800,7 +1800,7 @@ msgstr "MIME-type"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Grootte"
@@ -2516,7 +2516,7 @@ msgstr "Nieuwsgroepen:"
 msgid "Creating header view...\n"
 msgstr "Header view wordt aangemaakt...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Geen afzender)"
@@ -2803,7 +2803,7 @@ msgstr "Verbinden met POP3-server: %s ..."
 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:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Bezig met identificatie..."
@@ -2880,7 +2880,7 @@ msgstr "Socket-fout."
 
 #  consider EOF right after QUIT successful
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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."
@@ -2898,11 +2898,11 @@ msgstr ""
 "Mailbox is vergrendeld:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 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:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2911,7 +2911,7 @@ msgstr ""
 "Identificatie mislukt:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Sessie is verlopen."
 
@@ -6016,19 +6016,19 @@ msgid "Attachment"
 msgstr "Bijlage"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Onderwerp"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Afzender"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Datum"
@@ -6354,7 +6354,7 @@ msgstr "Doorzoeken van %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Doorzoeken van %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Geen datum)"
 
@@ -6417,94 +6417,108 @@ msgstr "Handtekening gemaakt op %s\n"
 msgid "Error verifying the signature"
 msgstr "Er is een fout opgetreden bij het controleren van de handtekening"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_Bestand"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Ophalen"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/_Hulp"
+
+#: src/rpop3.c:249
+msgid "_About"
+msgstr "_Info"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "mailbox verwijderen"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "Nr."
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Ophalen"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Bezig met verbinden met SMTP server: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Kan niet verbinden met POP3 server: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "er is een fout opgetreden tijdens de POP3-sessie\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "er is een fout opgetreden tijdens de POP3-sessie\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Ophalen van berichtkoppen (%d / %d)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Geen nieuwe berichten."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Verwijder bericht(en)"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Bezig met afsluiten..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Nieuwe berichten worden opgehaald"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Verzend bericht"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Nieuwe berichten worden opgehaald"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Berichten ophalen van %s..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Verwijder bericht(en)"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -7310,9 +7324,6 @@ msgstr "Sylpheed"
 #~ msgid "SSL connect failed (%s)\n"
 #~ msgstr "SSL verbinding mislukt (%s)\n"
 
-#~ msgid "_About"
-#~ msgstr "_Info"
-
 #~ msgid "/_View/Show all _headers"
 #~ msgstr "/Beel_d/Vo_lledige koptekst"
 
diff --git a/po/pl.po b/po/pl.po
index da437ce0..06e5ec4b 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+0900\n"
 "PO-Revision-Date: 2008-06-13 21:25+0100\n"
 "Last-Translator: Jan Stępień <jstepien@users.sourceforge.net>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -1587,7 +1587,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Nie można pobrać części wiadomości wieloczęściowej."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Bez tematu)"
 
@@ -1769,7 +1769,7 @@ msgstr "typ MIME"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Rozmiar"
@@ -2485,7 +2485,7 @@ msgstr "Grupy dyskusyjne:"
 msgid "Creating header view...\n"
 msgstr "Tworzenie widoku nagłówków...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Bez Od)"
@@ -2771,7 +2771,7 @@ msgstr "Nawiązywanie połączenia z serwerem POP3: %s..."
 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:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Uwierzytelnianie..."
@@ -2850,7 +2850,7 @@ msgid "Socket error."
 msgstr "Błąd gniazda."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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."
@@ -2868,11 +2868,11 @@ msgstr ""
 "Skrzynka jest zablokowana:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 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:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2881,7 +2881,7 @@ msgstr ""
 "Błąd uwierzytelniania:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Sesja wygasła."
 
@@ -5990,19 +5990,19 @@ msgid "Attachment"
 msgstr "Załącznik"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Temat"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Data"
@@ -6329,7 +6329,7 @@ msgstr "Przeszukiwanie katalogu %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtowanie..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Bez daty)"
 
@@ -6398,94 +6398,109 @@ msgstr "Podpis wykonano %s\n"
 msgid "Error verifying the signature"
 msgstr "Błąd podczas sprawdzania podpisu"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_Plik"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Odbierz"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/Pomo_c"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "O programie"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Usuń skrzynkę"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "Nr"
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Odbierz"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Łączenie z serwerem SMTP: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Nie można nawiązać połączenia z serwerem POP3: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "wystąpił błąd podczas sesji POP3\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "wystąpił błąd podczas sesji POP3\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Pobieranie nagłówków wiadomości (%d/%d)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Pobieranie liczby nowych wiadomości (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Brak nowych wiadomości"
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Usuń wiadomość"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Wychodzenie..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Pobieranie nowych wiadomości"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Wyślij wiadomość"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Pobieranie nowych wiadomości"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Pobieranie wiadomości z %s..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Usuń wiadomość"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -7322,10 +7337,6 @@ msgstr "Dawny Sylpheed"
 #~ msgstr "Błąd połączenia SSL (%s)\n"
 
 #, fuzzy
-#~ msgid "_About"
-#~ msgstr "O programie"
-
-#, fuzzy
 #~ msgid "/_View/Show all _headers"
 #~ msgstr "/_Widok/Pokaż wszystkie na_główki"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index dcb1638f..5cef66e8 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+0900\n"
 "PO-Revision-Date: 2008-04-25 09:30-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
@@ -1596,7 +1596,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Não foi possível obter alguma(s) parte(s) dessa mensagem."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
@@ -1790,7 +1790,7 @@ msgstr "Tipo MIME"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Tamanho"
@@ -2502,7 +2502,7 @@ msgstr "Grupos de notícias:"
 msgid "Creating header view...\n"
 msgstr "Criando visualizador de cabeçalhos...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Sem remetente)"
@@ -2781,7 +2781,7 @@ msgstr "Conectando ao servidor POP3: %s..."
 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:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Autenticando..."
@@ -2859,7 +2859,7 @@ msgid "Socket error."
 msgstr "erro de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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."
@@ -2877,11 +2877,11 @@ msgstr ""
 "Caixa de correio está trancada:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 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:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2890,7 +2890,7 @@ msgstr ""
 "Falha de autenticação:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Tempo limite da sessão."
 
@@ -5957,19 +5957,19 @@ msgid "Attachment"
 msgstr "Anexo"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Assunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "De"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Data"
@@ -6281,7 +6281,7 @@ msgstr "Procurando %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Procurando %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Sem data)"
 
@@ -6343,94 +6343,109 @@ msgstr "Assinatura feita em %s\n"
 msgid "Error verifying the signature"
 msgstr "Erro verificando a assinatura"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_Arquivo"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Baixar"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/A_juda"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "Sobre"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Remover caixa de correio"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "Nº"
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Baixar"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Conectando com o servidor SMTP: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Não foi possível se conectar ao servidor POP3: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "Erro na sessão POP3\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "Erro na sessão POP3\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Buscando cabeçalhos das mensagens (%d / %d)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Obtendo o número de novas mensagens (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Não há mensagens novas."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Apagar a(s) mensagem(s)"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Saindo..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Obtendo novas mensagens"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Enviar mensagem"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Obtendo novas mensagens"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Recebendo mensagens de %s..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Apagar a(s) mensagem(s)"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/ro.po b/po/ro.po
index d8243e0c..0b71c9dc 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+0900\n"
 "PO-Revision-Date: 2008-05-20 13:42+0200\n"
 "Last-Translator: Cristian Secară <cristi AT secarica DO ro>\n"
 "Language-Team: \n"
@@ -1616,7 +1616,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Nu se poate obține o parte a mesajului multiparte."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Fără subiect)"
 
@@ -1810,7 +1810,7 @@ msgstr "Tip MIME"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Dimensiune"
@@ -2526,7 +2526,7 @@ msgstr "Grupuri de știri:"
 msgid "Creating header view...\n"
 msgstr "Creare vizualizare antet...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Fără expeditor)"
@@ -2809,7 +2809,7 @@ msgstr "Conectare la serverul POP3: %s ..."
 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:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentificare..."
@@ -2887,7 +2887,7 @@ msgid "Socket error."
 msgstr "Eroare socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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ță."
@@ -2905,11 +2905,11 @@ msgstr ""
 "Căsuța poștală este blocată:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 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:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2918,7 +2918,7 @@ msgstr ""
 "Autentificarea a eșuat:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Timpul sesiunii a expirat."
 
@@ -6024,19 +6024,19 @@ msgid "Attachment"
 msgstr "Atașament"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Subiect"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Expeditor"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Dată"
@@ -6353,7 +6353,7 @@ msgstr "Căutare %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Căutare %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Fără Dată)"
 
@@ -6419,94 +6419,109 @@ msgstr "Semnătură creată la %s\n"
 msgid "Error verifying the signature"
 msgstr "Eroare la verificarea semnăturii"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_Fișier"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Verifică"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/_Ajutor"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "Despre"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Ștergere căsuță poștală"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "Nu."
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Verifică"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Conectare la serverul SMTP: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Nu se poate efectua conexiunea la serverul POP3: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "a apărut o eroare la sesiunea POP3\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "a apărut o eroare la sesiunea POP3\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Obținere anteturi mesaje (%d / %d)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Obținerea numărului de mesaje noi (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Nu există mesaje noi."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Ștergere mesaj(e)"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Părăsire..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Recepționare mesaje noi"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Trimite mesajul acum"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Recepționare mesaje noi"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Recepționare mesaje de la %s..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Ștergere mesaj(e)"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/ru.po b/po/ru.po
index 7785e5e5..c3fbe201 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+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"
@@ -1591,7 +1591,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ошибка при получении одного из компонентов сообщения."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Без темы)"
 
@@ -1786,7 +1786,7 @@ msgstr "Тип MIME"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Размер"
@@ -2497,7 +2497,7 @@ msgstr "Группы новостей:"
 msgid "Creating header view...\n"
 msgstr "Создание области просмотра заголовков...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Без отправителя)"
@@ -2774,7 +2774,7 @@ msgstr "Соединение с сервером POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не удалось соединиться с сервером POP3: %s:%d\n"
 
-#: src/inc.c:934 src/rpop3.c:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Аутентификация..."
@@ -2852,7 +2852,7 @@ msgid "Socket error."
 msgstr "Ошибка сокета."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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 "Сервер закрыл соединение."
@@ -2870,11 +2870,11 @@ msgstr ""
 "Почтовый ящик занят:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Ошибка аутентификации."
 
-#: src/inc.c:1330 src/rpop3.c:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2883,7 +2883,7 @@ msgstr ""
 "Ошибка аутентификации:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Время сеанса истекло."
 
@@ -5952,19 +5952,19 @@ msgid "Attachment"
 msgstr "Вложение"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "От"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Дата"
@@ -6277,7 +6277,7 @@ msgstr "Поиск в папке \"%s\"..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Поиск в папке \"%s\" (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Нет даты)"
 
@@ -6339,94 +6339,108 @@ msgstr "Подпись создана %s\n"
 msgid "Error verifying the signature"
 msgstr "Ошибка проверки подписи"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/Файл"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Принять"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/Справка"
+
+#: src/rpop3.c:249
+msgid "_About"
+msgstr "О программе"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Удалить почтовый ящик"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "Номер"
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Принять"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Соединение с сервером SMTP: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Не удалось соединиться с сервером POP3: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "ошибка сеанса POP3\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "ошибка сеанса POP3\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Получение заголовков сообщений (%d / %d)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Получение количества новых сообщений (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Нет новых сообщений."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Удаление сообщений"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Завершение..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Получение новых сообщений"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Отправить сообщение"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Получение новых сообщений"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Получение сообщений с %s..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Удаление сообщений"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -7236,9 +7250,6 @@ msgstr "Sylpheed"
 #~ msgid "SSL connect failed (%s)\n"
 #~ msgstr "Ошибка соединения SSL (%s)\n"
 
-#~ msgid "_About"
-#~ msgstr "О программе"
-
 #~ msgid "/_View/Show all _headers"
 #~ msgstr "/Вид/Показать все заголовки"
 
diff --git a/po/sk.po b/po/sk.po
index 3b326985..953facad 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+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"
@@ -1642,7 +1642,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Nedá sa získať časť viacdielnej správy."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 
@@ -1833,7 +1833,7 @@ msgstr "MIME typ"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Veľkosť"
@@ -2560,7 +2560,7 @@ msgstr "Diskusné skupiny:"
 msgid "Creating header view...\n"
 msgstr "Vytváram náhľad hlavičky...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(nie je známy odosielateľ)"
@@ -2847,7 +2847,7 @@ msgstr "Pripájam sa k serveru POP3: %s..."
 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:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentizácia..."
@@ -2923,7 +2923,7 @@ msgid "Socket error."
 msgstr "Chyba socketu."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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."
@@ -2941,11 +2941,11 @@ msgstr ""
 "Mailbox je zamknutý:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 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:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2954,7 +2954,7 @@ msgstr ""
 "Autentizácia bola neúspešná:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 #, fuzzy
 msgid "Session timed out."
 msgstr "čas spojenia vypršal\n"
@@ -6128,19 +6128,19 @@ msgid "Attachment"
 msgstr "Príloha"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Predmet"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Dátum"
@@ -6469,7 +6469,7 @@ msgstr "Prehľadávam priečinok %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrujem..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(bez dátumu)"
 
@@ -6537,94 +6537,109 @@ msgstr "Podpísané dňa %s\n"
 msgid "Error verifying the signature"
 msgstr "Chyba pri overovaní podpisu"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_Súbor"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Prijať"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/Nápo_veda"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "O programe"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Odstrániť schránku"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "Č."
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Prijať"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Pripájam sa k serveru SMTP: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "vyskytla sa chyba pri POP3 spojení\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "vyskytla sa chyba pri POP3 spojení\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Získavam počet nových správ (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Žiadne nové správy."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Zmazať správy"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Odpájam sa..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Prijímam nové správy"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Odoslať správu"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Prijímam nové správy"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Prijímam správy z %s..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Zmazať správy"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -7442,10 +7457,6 @@ msgstr "Starší Sylpheed"
 #~ msgstr "SSL spojenie zlyhalo (%s)\n"
 
 #, fuzzy
-#~ msgid "_About"
-#~ msgstr "O programe"
-
-#, fuzzy
 #~ msgid "/_View/Show all _headers"
 #~ msgstr "/_Zobraziť/Zobraziť všetky _hlavičky"
 
diff --git a/po/sl.po b/po/sl.po
index f958e449..5e2e7323 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+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"
@@ -1648,7 +1648,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela večdelnega sporočila."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Brez zadeve)"
 
@@ -1838,7 +1838,7 @@ msgstr "Tip MIME"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Velikost"
@@ -2565,7 +2565,7 @@ msgstr "Novičarske skupine:"
 msgid "Creating header view...\n"
 msgstr "Delam gledanje zaglavja...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Brez pošiljatelja)"
@@ -2852,7 +2852,7 @@ msgstr "Povezujem se s strežnikom POP: %s"
 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:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Overovljam..."
@@ -2927,7 +2927,7 @@ msgid "Socket error."
 msgstr "napaka v priključku."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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 ""
@@ -2943,19 +2943,19 @@ msgid ""
 "%s"
 msgstr "Poštni predal je zaklenjen."
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 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:444 src/send_message.c:949
+#: src/inc.c:1330 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:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr ""
 
@@ -6130,19 +6130,19 @@ msgid "Attachment"
 msgstr "Priloga"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Zadeva"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Datum"
@@ -6469,7 +6469,7 @@ msgstr "Preiskujem mapo %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriram..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Brez datuma)"
 
@@ -6537,94 +6537,109 @@ msgstr "Podpis narejen v %s\n"
 msgid "Error verifying the signature"
 msgstr "Napaka ob overovljanju podpisa"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_Datoteka"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Poberi"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/_Pomoč"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "O"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Odstrani poštni predal"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "Ne."
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Poberi"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Povezujem se s strežnikom SMTP: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Ne morem se povezati s strežnikom POP: %s%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "Med preverjanjem istovetnosti je prišlo do napake\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "Med preverjanjem istovetnosti je prišlo do napake\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Pošiljam sporočilo (%d / %d zlogov)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Ugotavljam število novih sporočil (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Ni novih sporočil."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Izbriši sporočilo/a"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Zapuščam..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Prenašam nova sporočila"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Pošlji sporočilo"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Prenašam nova sporočila"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Izbriši sporočilo/a"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -7444,10 +7459,6 @@ msgstr "Stari Sylpheed"
 #~ msgstr "Povezava SSL ni uspela (%s)\n"
 
 #, fuzzy
-#~ msgid "_About"
-#~ msgstr "O"
-
-#, fuzzy
 #~ msgid "/_View/Show all _headers"
 #~ msgstr "/_Pogled/Pokaži vsa _zaglavja"
 
diff --git a/po/sr.po b/po/sr.po
index 713b83f8..e21d2365 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -1642,7 +1642,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti deo poruke iz više delova."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
@@ -1833,7 +1833,7 @@ msgstr "MIME tip"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Veličina"
@@ -2560,7 +2560,7 @@ msgstr "News grupe:"
 msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Bez pošiljaoca)"
@@ -2846,7 +2846,7 @@ msgstr "Povezujem se na POP3 server: %s ..."
 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:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
@@ -2921,7 +2921,7 @@ msgid "Socket error."
 msgstr "Protokol greška."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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 ""
@@ -2937,19 +2937,19 @@ msgid ""
 "%s"
 msgstr "Sanduče je zaključano."
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 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:444 src/send_message.c:949
+#: src/inc.c:1330 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:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr ""
 
@@ -6124,19 +6124,19 @@ msgid "Attachment"
 msgstr "Dodatak"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Datum"
@@ -6463,7 +6463,7 @@ msgstr "Pretražujem direktorijum %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
@@ -6532,94 +6532,109 @@ msgstr "Potpis napravljen %s\n"
 msgid "Error verifying the signature"
 msgstr "Greška pri potvrđivanju potpisa"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_Datoteka"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Primi"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/_Pomoć"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "O"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "Ne."
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Primi"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Spajam se na SMTP server: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Ne mogu se povezati na POP3 server: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "greška prilikom provere identiteta\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "greška prilikom provere identiteta\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Šaljem poruku (%d / %d bajtova)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Preuzimam broj novih poruka (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Nema novih poruka."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Obriši poruku/e"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Završavnje..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Primam nove poruke"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Pošalji poruku"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Primam nove poruke"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Obriši poruku/e"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -7439,10 +7454,6 @@ msgstr "Stari Sylpheed"
 #~ msgstr "SSL veza nije uspela (%s)\n"
 
 #, fuzzy
-#~ msgid "_About"
-#~ msgstr "O"
-
-#, fuzzy
 #~ msgid "/_View/Show all _headers"
 #~ msgstr "/_Pregled/Prikaži kompletno _zaglavlje"
 
diff --git a/po/sv.po b/po/sv.po
index 980928be..d924a6d8 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+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"
@@ -1606,7 +1606,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Kan inte läsa delen av multipart-meddelandet."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Inget Ämne)"
 
@@ -1798,7 +1798,7 @@ msgstr "MIME-typ"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Storlek"
@@ -2515,7 +2515,7 @@ msgstr "Diskussionsgrupper:"
 msgid "Creating header view...\n"
 msgstr "Skapar brevhuvudvy...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Inget Från)"
@@ -2801,7 +2801,7 @@ msgstr "Ansluter till POP3-server: %s ..."
 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:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentiserar..."
@@ -2877,7 +2877,7 @@ msgid "Socket error."
 msgstr "Fel på uttag (socket)."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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."
@@ -2895,11 +2895,11 @@ msgstr ""
 "Brevlådan är låst:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 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:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2908,7 +2908,7 @@ msgstr ""
 "Autentisering misslyckades:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Sessionens väntetid tog slut."
 
@@ -6001,19 +6001,19 @@ msgid "Attachment"
 msgstr "Bilaga"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Ärende"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Från"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Datum"
@@ -6341,7 +6341,7 @@ msgstr "Söker igenom mapp %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrerar..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Inget datum)"
 
@@ -6409,94 +6409,109 @@ msgstr "Signatur skapad %s\n"
 msgid "Error verifying the signature"
 msgstr "Fel vid verifikation av signatur"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_Arkiv"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Hämta"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/_Hjälp"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "Om"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Ta bort brevlåda"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "Nr."
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Hämta"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Upprättar förbindelse med SMTP-server: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Kan inte ansluta till POP3-server: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "fel uppstod vid POP3-session\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "fel uppstod vid POP3-session\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Hämtar meddelandehuvuden (%d / %d)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Tar emot meddelandenas antal (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Inga nya meddelanden."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Ta bort meddelande(n)"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Avslutar..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Hämtar nya meddelanden"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Skicka meddelande"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Hämtar nya meddelanden"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Hämtar meddelanden från %s..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Ta bort meddelande(n)"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -7308,10 +7323,6 @@ msgstr "Sylpheed"
 #~ msgstr "SSL-anslutning misslyckades (%s)\n"
 
 #, fuzzy
-#~ msgid "_About"
-#~ msgstr "Om"
-
-#, fuzzy
 #~ msgid "/_View/Show all _headers"
 #~ msgstr "/_Visa/_Hela brevhuvudet"
 
diff --git a/po/tr.po b/po/tr.po
index 67ac28c7..e3cefbad 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+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"
@@ -1635,7 +1635,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Çok parçalı mesajın bir kısmı alınamadı"
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Konu yok)"
 
@@ -1826,7 +1826,7 @@ msgstr "MIME türü"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Boyut"
@@ -2550,7 +2550,7 @@ msgstr "Haber grupları:"
 msgid "Creating header view...\n"
 msgstr "Başlık görünümü oluşturuluyor...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Kimden satırı yok)"
@@ -2836,7 +2836,7 @@ msgstr "POP3 sunucusuna bağlantı kuruluyor: %s ..."
 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:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Kimlik denetimi yapılıyor..."
@@ -2912,7 +2912,7 @@ msgid "Socket error."
 msgstr "protokol hatası"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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."
@@ -2930,11 +2930,11 @@ msgstr ""
 "Posta kutusu kilitli:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 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:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2943,7 +2943,7 @@ msgstr ""
 "Yetkilendirme başarısız:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 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ı."
 
@@ -6075,19 +6075,19 @@ msgid "Attachment"
 msgstr "Ek"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Konu"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Kimden"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Tarih"
@@ -6414,7 +6414,7 @@ msgstr "%s dizini taranıyor..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtreleniyor..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Tarih Yok)"
 
@@ -6482,94 +6482,109 @@ msgstr "İmza atılma tarihi %s\n"
 msgid "Error verifying the signature"
 msgstr "İmza doğrulanırken hata"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_Dosya"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Al"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/_Yardım"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "Hakkında"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Posta kutusunu sil"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "Hayır."
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Al"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "SMTP sunucuya bağlantı kuruluyor: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "POP3 sunucuya bağlantı kurulamadı: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "POP3 oturumunda hata oluştu\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "POP3 oturumunda hata oluştu\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "İleti gönderiliyor (%d / %d bayt)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Yeni ileti numaraları alınıyor (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Yeni ileti yok."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "İletileri  sil"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Çıkılıyor..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Yeni iletiler alınıyor"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "İletiyi gönder"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Yeni iletiler alınıyor"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "%s konumundan iletiler alınıyor..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "İletileri  sil"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -7392,10 +7407,6 @@ msgstr "Eski Sylpheed"
 #~ msgstr "SSL bağlantısında hata (%s)\n"
 
 #, fuzzy
-#~ msgid "_About"
-#~ msgstr "Hakkında"
-
-#, fuzzy
 #~ msgid "/_View/Show all _headers"
 #~ msgstr "/_Görünüm/Tüm _başlıkları görüntüle"
 
diff --git a/po/uk.po b/po/uk.po
index 56d66e1f..3c1d2f98 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+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"
@@ -1588,7 +1588,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Не вдалось отримати одну з частин листа."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Без теми)"
 
@@ -1784,7 +1784,7 @@ msgstr "тип MIME"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Розмір"
@@ -2493,7 +2493,7 @@ msgstr "Конференції:"
 msgid "Creating header view...\n"
 msgstr "Створюємо область перегляду заголовка...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Без відправника)"
@@ -2770,7 +2770,7 @@ msgstr "З'єднуємось з сервером POP3: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не вдалось з'єднатись з сервером POP3: %s:%d\n"
 
-#: src/inc.c:934 src/rpop3.c:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Автентифікація..."
@@ -2848,7 +2848,7 @@ msgid "Socket error."
 msgstr "Помилка сокета."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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 "З'єднання закрито віддаленим хостом."
@@ -2866,11 +2866,11 @@ msgstr ""
 "Скриньку заблоковано:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "Невдача аутентифікації."
 
-#: src/inc.c:1330 src/rpop3.c:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2879,7 +2879,7 @@ msgstr ""
 "Невдача аутентифікації:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "Таймаут сесії."
 
@@ -5939,19 +5939,19 @@ msgid "Attachment"
 msgstr "Вкладення"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Від"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Дата"
@@ -6263,7 +6263,7 @@ msgstr "Шукаємо %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Шукаємо %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Без дати)"
 
@@ -6325,94 +6325,109 @@ msgstr "Підпис створений %s\n"
 msgid "Error verifying the signature"
 msgstr "Помилка при перевірці підпису"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/Файл"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Отримати"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/Допомога"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "Про програму"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Видалити скриньку"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "Номер"
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Отримати"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "З'єднання з сервером SMTP: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Не вдалось з'єднатись з сервером POP3: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "помилка під час сесії POP3\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "помилка під час сесії POP3\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Отримуємо заголовки листів (%d / %d)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Отримуємо кількість нових листів (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Немає нових листів"
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Видалити лист(и)"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Виходимо..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Отримання нових листів"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Послати лист"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Отримання нових листів"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Отримуємо листи від %s..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Видалити лист(и)"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
diff --git a/po/vi.po b/po/vi.po
index 34a78c83..60003fdd 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+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"
@@ -1584,7 +1584,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Không thể lấy thành phần cho thư nhiều thành phần."
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(Không tiêu đề)"
 
@@ -1775,7 +1775,7 @@ msgstr "Kiểu MIME"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "Kích thước"
@@ -2489,7 +2489,7 @@ msgstr "Nhóm tin:"
 msgid "Creating header view...\n"
 msgstr "Đang tạo khung xem header...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(Không rõ người gửi)"
@@ -2775,7 +2775,7 @@ msgstr "Đang kết nối tới máy chủ POP3: %s..."
 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:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "Đang xác thực..."
@@ -2851,7 +2851,7 @@ msgid "Socket error."
 msgstr "Lỗi socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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."
@@ -2869,11 +2869,11 @@ msgstr ""
 "Hộp thư bị khoá:\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 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:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2882,7 +2882,7 @@ msgstr ""
 "Xác thực thất bại:\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 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ờ."
 
@@ -5966,19 +5966,19 @@ msgid "Attachment"
 msgstr "Đính kèm"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "Tiêu đề"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "Người gửi"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "Thời gian"
@@ -6303,7 +6303,7 @@ msgstr "Đang tìm %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Đang tìm %s (%d / %d)..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(Không ngày tháng)"
 
@@ -6366,94 +6366,108 @@ msgstr "Kí lúc %s\n"
 msgid "Error verifying the signature"
 msgstr "Lỗi khi xác thực chữ kí"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/_Tập tin"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "Lấy"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/_Hỗ trợ"
+
+#: src/rpop3.c:249
+msgid "_About"
+msgstr "Giới t_hiệu"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "Xoá hộp thư"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "Số "
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "Lấy"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "Đang kết nối tới máy chủ SMTP: %s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Không thể kết nối tới máy thủ POP3: %s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "có lỗi trong phiên làm việc POP3\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "có lỗi trong phiên làm việc POP3\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "Đang lấy header của thư (%d / %d)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "Đang xác định số lượng thư mới (STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "Không có thư mới."
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "Xoá thư"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "Đang thoát..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "Đang tải về thư mới"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "Gửi thư"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "Đang tải về thư mới"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "Đang lấy thư trên %s..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "Xoá thư"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -7255,9 +7269,6 @@ msgstr "Sylpheed"
 #~ msgid "SSL connect failed (%s)\n"
 #~ msgstr "Kết nối SSL thất bại (%s)\n"
 
-#~ msgid "_About"
-#~ msgstr "Giới t_hiệu"
-
 #~ msgid "/_View/Show all _headers"
 #~ msgstr "/_Xem/_Hiện mọi header"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ef94e6ef..e87736ba 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+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"
@@ -1600,7 +1600,7 @@ msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
@@ -1790,7 +1790,7 @@ msgstr "MIME 类型"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "大小"
@@ -2512,7 +2512,7 @@ msgstr "新闻组："
 msgid "Creating header view...\n"
 msgstr "正在创建标题视图...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "(没有发件人)"
@@ -2797,7 +2797,7 @@ msgstr "正在连接POP3服务器：%s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "无法连接POP3服务器：%s:%d\n"
 
-#: src/inc.c:934 src/rpop3.c:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "正在验证..."
@@ -2873,7 +2873,7 @@ msgid "Socket error."
 msgstr "Socket错误。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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 "远程主机关闭了连接。"
@@ -2891,11 +2891,11 @@ msgstr ""
 "信箱被锁住：\n"
 "%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "验证失败。"
 
-#: src/inc.c:1330 src/rpop3.c:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2904,7 +2904,7 @@ msgstr ""
 "验证失败：\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "会话超时。"
 
@@ -6007,19 +6007,19 @@ msgid "Attachment"
 msgstr "附件"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "主题"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "发件人"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "日期"
@@ -6346,7 +6346,7 @@ msgstr "正在扫描文件夹 %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(没有日期)"
 
@@ -6414,94 +6414,109 @@ msgstr "签名创建于 %s\n"
 msgid "Error verifying the signature"
 msgstr "验证签名时发生错误"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/文件(_F)"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "接收"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/帮助(_H)"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "关于"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "删除邮箱"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "No."
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "接收"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "正在连接SMTP服务器：%s ..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "无法连接POP3服务器：%s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "POP3 会话发生错误\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "POP3 会话发生错误\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "正在发送邮件 (%d / %d 字节)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "正在获取新邮件数量(STAT)..."
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "没有新邮件"
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "删除邮件"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "正在退出..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "正在获取新邮件"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "立即发送邮件"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "正在获取新邮件"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "正在从 %s 获取邮件..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "删除邮件"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -7320,10 +7335,6 @@ msgstr "旧式的Sylpheed"
 #~ msgstr "SSL连接失败(%s)\n"
 
 #, fuzzy
-#~ msgid "_About"
-#~ msgstr "关于"
-
-#, fuzzy
 #~ msgid "/_View/Show all _headers"
 #~ msgstr "/查看(_V)/显示所有邮件头(_H)"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ee5284dc..f7a9bbad 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-11-13 14:59+0900\n"
+"POT-Creation-Date: 2008-11-14 13:39+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"
@@ -1602,7 +1602,7 @@ msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:586 src/summaryview.c:2271
+#: src/rpop3.c:663 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "（沒有主旨）"
 
@@ -1792,7 +1792,7 @@ msgstr "MIME 型態"
 
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
-#: src/prefs_summary_column.c:78 src/rpop3.c:353 src/select-keys.c:320
+#: src/prefs_summary_column.c:78 src/rpop3.c:418 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "大小"
@@ -2509,7 +2509,7 @@ msgstr "新聞群組："
 msgid "Creating header view...\n"
 msgstr "產生標頭視窗...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:587
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:664
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "（沒有來源）"
@@ -2795,7 +2795,7 @@ msgstr "連線到 POP3 伺服器 %s 中..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "無法連線到 POP3 伺服器：%s:%d\n"
 
-#: src/inc.c:934 src/rpop3.c:743 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:820 src/send_message.c:813
 #, c-format
 msgid "Authenticating..."
 msgstr "認證"
@@ -2871,7 +2871,7 @@ msgid "Socket error."
 msgstr "Socket 有錯誤"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1309 src/rpop3.c:467 src/rpop3.c:468 src/send_message.c:760
+#: src/inc.c:1309 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 "遠端主機關閉連線。"
@@ -2887,11 +2887,11 @@ msgid ""
 "%s"
 msgstr "信箱已被鎖定：%s"
 
-#: src/inc.c:1325 src/rpop3.c:442 src/rpop3.c:447 src/send_message.c:946
+#: src/inc.c:1325 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "認證失敗"
 
-#: src/inc.c:1330 src/rpop3.c:444 src/send_message.c:949
+#: src/inc.c:1330 src/rpop3.c:521 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2900,7 +2900,7 @@ msgstr ""
 "認證失敗：\n"
 "%s"
 
-#: src/inc.c:1335 src/rpop3.c:472 src/rpop3.c:473 src/send_message.c:970
+#: src/inc.c:1335 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:970
 msgid "Session timed out."
 msgstr "作業逾時"
 
@@ -5971,19 +5971,19 @@ msgid "Attachment"
 msgstr "附加檔案"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:350
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:415
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "主旨"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:351
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:416
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "來源"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:352
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:417
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "日期"
@@ -6310,7 +6310,7 @@ msgstr "掃描資料夾 %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "過濾中..."
 
-#: src/query_search.c:696 src/rpop3.c:595 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:672 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(沒有日期)"
 
@@ -6378,94 +6378,109 @@ msgstr "產生簽章於 %s\n"
 msgid "Error verifying the signature"
 msgstr "檢查簽章時發生錯誤"
 
-#: src/rpop3.c:290
+#: src/rpop3.c:242
+#, fuzzy
+msgid "_File"
+msgstr "/檔案(_F)"
+
+#: src/rpop3.c:243 src/rpop3.c:436
+#, fuzzy
+msgid "_Get"
+msgstr "檢查郵件"
+
+#: src/rpop3.c:248
+#, fuzzy
+msgid "_Help"
+msgstr "/說明(_H)"
+
+#: src/rpop3.c:249
+#, fuzzy
+msgid "_About"
+msgstr "關於"
+
+#: src/rpop3.c:338
 #, fuzzy, c-format
 msgid "%s - POP3 Remote mailbox"
 msgstr "移除信箱"
 
-#: src/rpop3.c:349 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5091
 msgid "No."
 msgstr "No."
 
-#: src/rpop3.c:371
-#, fuzzy
-msgid "_Get"
-msgstr "檢查郵件"
-
-#: src/rpop3.c:420
+#: src/rpop3.c:497
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "連線到 SMTP 伺服器 %s..."
 
-#: src/rpop3.c:425 src/rpop3.c:479 src/rpop3.c:482
+#: src/rpop3.c:502 src/rpop3.c:556 src/rpop3.c:559
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "無法連線到 POP3 伺服器：%s:%d\n"
 
-#: src/rpop3.c:453 src/rpop3.c:459 src/rpop3.c:486 src/rpop3.c:488
+#: src/rpop3.c:530 src/rpop3.c:536 src/rpop3.c:563 src/rpop3.c:565
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "使用 POP3 通訊協定時發生錯誤\n"
 
-#: src/rpop3.c:456
+#: src/rpop3.c:533
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "使用 POP3 通訊協定時發生錯誤\n"
 
-#: src/rpop3.c:609
+#: src/rpop3.c:686
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "擷取郵件表頭 (%d / %d)"
 
-#: src/rpop3.c:769
+#: src/rpop3.c:846
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "取得新郵件的數量中"
 
-#: src/rpop3.c:778 src/rpop3.c:791
+#: src/rpop3.c:855 src/rpop3.c:868
 #, fuzzy
 msgid "No message"
 msgstr "沒有新郵件。"
 
-#: src/rpop3.c:824
+#: src/rpop3.c:901
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "刪除郵件"
 
-#: src/rpop3.c:862 src/rpop3.c:874 src/rpop3.c:922 src/rpop3.c:1109
+#: src/rpop3.c:939 src/rpop3.c:951 src/rpop3.c:1001 src/rpop3.c:1196
 #: src/send_message.c:830
 #, c-format
 msgid "Quitting..."
 msgstr "離開中..."
 
-#: src/rpop3.c:907
+#: src/rpop3.c:986
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "取得新郵件中"
 
-#: src/rpop3.c:914
+#: src/rpop3.c:993
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "送出郵件"
 
-#: src/rpop3.c:930
+#: src/rpop3.c:1009
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "取得新郵件中"
 
-#: src/rpop3.c:1035
+#: src/rpop3.c:1122
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "從 %s 中取得郵件中..."
 
-#: src/rpop3.c:1061
+#: src/rpop3.c:1148
 #, fuzzy
 msgid "Delete messages"
 msgstr "刪除郵件"
 
-#: src/rpop3.c:1062
+#: src/rpop3.c:1149
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -7275,10 +7290,6 @@ msgstr "Sylpheed"
 #~ msgstr "SSL 連線失敗 (%s)。\n"
 
 #, fuzzy
-#~ msgid "_About"
-#~ msgstr "關於"
-
-#, fuzzy
 #~ msgid "/_View/Show all _headers"
 #~ msgstr "/顯示(_V)/顯示所有的標頭(_H)"
author	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2008-11-14 04:44:06 +0000
committer	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2008-11-14 04:44:06 +0000
commit	83ee9999035fcf1e83ac545c0b6380c2b2678a77 (patch)
tree	e7a4a0b6c3fcd35b6179cb60fb346a3b0a1f8e87 /po
parent	38116a68e113c4234a792513ee42072f1143ded3 (diff)