impelmented POP before SMTP.

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

29 files changed, 5335 insertions, 5046 deletions

diff --git a/po/bg.po b/po/bg.po
index 1818692b..ef00e2f7 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+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"
@@ -687,7 +687,7 @@ msgstr ""
 msgid "Name"
 msgstr "Име"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Протокол"
 
@@ -1154,7 +1154,7 @@ msgid "Group"
 msgstr "Група"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Папка"
@@ -1187,7 +1187,7 @@ msgstr "Забележка"
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Грешка"
 
@@ -1638,7 +1638,7 @@ msgstr ""
 "Не е указан акаунт за изпращане на пощата.\n"
 "Моля изберете пощенску акаунт преди изпращане."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Възникна грешка при пращане на съобщението до %s."
@@ -1743,7 +1743,7 @@ msgstr "MIME тип"
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Изпращане"
@@ -1785,7 +1785,7 @@ msgid "Attach file"
 msgstr "Прикрепване на файл"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Сигнатура"
@@ -1999,7 +1999,7 @@ msgid " Check File "
 msgstr " Проверка на файл "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Файл"
 
@@ -2077,7 +2077,7 @@ msgid "Edit JPilot Entry"
 msgstr "Редактиране на JPilot запис"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2142,7 +2142,7 @@ msgstr "Пауза (сек)"
 msgid "Maximum Entries"
 msgstr "Максимум записи"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Основни"
 
@@ -2199,7 +2199,7 @@ msgid "Exporting file:"
 msgstr "Изходен файл:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr "Избор..."
 
@@ -2654,134 +2654,144 @@ msgstr "Завършване"
 msgid "Sylpheed: %d new messages"
 msgstr "Завършено (%d нови съобщения)"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Удостоверяване"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Получаване на нови съобщения"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "Изчакване"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Отказан"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Получаване"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Завършено (%d съобщения (%s) получени)"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "Завършено (няма нови съобщения)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Връзката се провали"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Удостоверяването се провали"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Заключен"
 
-#: src/inc.c:596
+#: src/inc.c:635
 #, fuzzy
 msgid "Timeout"
 msgstr "Пауза (сек)"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Завършено (%d нови съобщения)"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Завършено (няма нови съобщения)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "Възникнаха грешки при получаване на пощата."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "получаване на нови съобщения от акаунт %s...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Удостоверяване"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Получаване на нови съобщения"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Свързване с POP3 сървър: %s..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не може да се установи връзка с POP3 сървър: %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Удостоверяване..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Получаване на съобщения от %s..."
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Взимане на броят на нови съобщения (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Взимане на броят на нови съобщения (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Взимане на броят на нови съобщения (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Взимане на размерът на съобщенията (LIST)... "
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "Изтриване на съобщение %d"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Прекъсване"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получаване на съобшение (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Получаване (%d съобщения (%s) получени)"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 msgid "Connection failed."
 msgstr "Връзката провалена"
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "Възникна грешка при обработка на пощата"
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2790,28 +2800,28 @@ msgstr ""
 "Възникна грешка при обработка на пощата:\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Няма свободно място на диска"
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "Файлът не може да се запише."
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "Грешка в сокет."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr "Връзката е прекратена от отдалечения хост."
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "Пощенската кутия е заключена."
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2820,11 +2830,11 @@ msgstr ""
 "Пощенската кутия е заключена:\n"
 "%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 msgid "Authentication failed."
 msgstr "Удостоверяването се провали."
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2833,16 +2843,16 @@ msgstr ""
 "Удостоверяването се провали:\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 #, fuzzy
 msgid "Session timed out."
 msgstr "сесията е просрочена\n"
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "Обединяването е отменено\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Получаване на нови съобшения от %s в %s...\n"
@@ -3750,7 +3760,7 @@ msgstr "Приемане на нова поща от всички акаунти
 msgid "Send queued message(s)"
 msgstr "Изпращане на съобщенията в опашката"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Съставяне"
@@ -4091,225 +4101,225 @@ msgstr ""
 "Неправилна парола! Опитайте отново...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Отваряне на прозорец с предпочитанията за акаунта...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Акаунт%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Предпочитания за нов акаунт"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Предпочитания за акаунт"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Създаване на прозорец с предпочитанията за акаунта...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Получаване"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Неприкосновеност"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Напреднал"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Име на акаунтът"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "Установяване като подразбиращ се"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Лична информация"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Пълно име"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "Пощенски адрес"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Организация"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Информация за сървъра"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "Новини (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Без (локално)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Сървърът изисква удостоверяване"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "Новинарски сървър"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Сървър за получаване"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "SMTP сървър (изпращане)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "Потребителски ID"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Парола"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Сървърът изисква удостоверяване"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Изтриване съобщенията от сървъра когато се получат"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Премахване след"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "дни"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 дни: незабавно премахване)"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Изтегляне на всички съобщения от сървъра"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Ограничение на размера при получаване"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "КB"
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Филтриране на съобщенията при получаване"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Входяща кутия"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Нефилтрираните съобщения ще бъдат съхранявани в тази папка)"
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Метод на удостоверяване"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "Само при ръчно получаване"
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "Новини"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Максимален брой изтегляни статии\n"
 "(неограничено ако е въведена 0)"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Не е указан получател"
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "'Получаване всички' проверява за нови съобщения в този акаунт"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Заглавна част"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Добавяне на заглавна част Дата"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Генериране на Message-ID"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Добавяне на заглавна част от потребителя"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " Редактиране... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Удостоверяване"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Удостоверяване (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4322,192 +4332,192 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Удостоверяване с POP3 преди изпращане"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 msgid "Command output"
 msgstr "Изход на команда"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Автоматично установяване на следните адреси"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Отговор-до"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Подписване по подразбиране"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Криптиране по подразбиране"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "Използване на ASCII-armored формат за криптиране"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Използване на подпис в чист текст"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Подписващ ключ"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Използване на подразбиращия се GnuPG ключ"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Избор на ключ по вашия email адрес"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Ръчен избор на ключ"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "ID на потребителя или ключа:"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "Не се използва SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "Използване на SSL за POP3 връзка"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Използване на STARTTLS команда за старт на SSL сесия"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "Използване на SSL за IMAP4 връзка"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "Използване на SSL за NNTP връзка"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Изпращане (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "Използване на SSL за SMTP връзка"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr "Използване на неблокиращ SSL"
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(Изключете ако имате проблеми с SSL връзка)"
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "Определяне на SMTP порт"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "Определяне на POP3 порт"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "Определяне на IMAP4 порт"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "Определяне на NNTP порт"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Определяне на име на домейн"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "IMAP директория на сървъра"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Изтегляне на всички съобщения от сървъра"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Поставяне на изпратени съобщения в"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Поставяне на черновите в"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Поставяне на изтрити съобщения в"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Поставяне на изтрити съобщения в"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "Не е въведено име на акаунта."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "Не е въведен пощенски адрес."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "Не е въведен SMTP сървър."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "Не е въведен потребителски ID."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "Не е въведен POP3 сървър."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "Не е въведен IMAP4 сървър."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "Не е въведен NNTP сървър."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6134,84 +6144,84 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "Повредена заглавна част на съобщение в опашката.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Изпращане на съобщение (%d / %d байта)"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Изпълняване"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Появи се грешка изпращане на съобщението."
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Свързване"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Свързване с SMTP сървър: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "Изпращане на HELO..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "Удостоверяване"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 msgid "Sending message..."
 msgstr "Изпращане на съобшение..."
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "Изпращане на EHLO..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Изпращане на MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Изпращане"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Изпращане на RCPT ДО..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Изпращане на DATA..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Прекъсване..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Изпращане на съобщение (%d / %d байта)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Изпращане на съобшение"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "Появи се грешка изпращане на съобщението."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/cs.po b/po/cs.po
index 21c1aeaf..214921f0 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+0900\n"
 "PO-Revision-Date: 2003-05-30 13:31GMT+0100\n"
 "Last-Translator: Radek Vybíral <Radek.Vybiral@vsb.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -690,7 +690,7 @@ msgstr ""
 msgid "Name"
 msgstr "Jméno"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -1155,7 +1155,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Složka"
@@ -1188,7 +1188,7 @@ msgstr "Poznámka"
 msgid "Warning"
 msgstr "Varování"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Chyba"
 
@@ -1639,7 +1639,7 @@ msgstr ""
 "Není zadán účet pro odesílání mailů.\n"
 "Před odesláním vyberte prosím nějaký účet."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Vyskytla se chyba při posílání zprávy na %s ."
@@ -1744,7 +1744,7 @@ msgstr "MIME typ"
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Odeslat"
@@ -1786,7 +1786,7 @@ msgid "Attach file"
 msgstr "Připojí soubor"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Podpis"
@@ -2000,7 +2000,7 @@ msgid " Check File "
 msgstr " Otestovat soubor "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Soubor"
 
@@ -2079,7 +2079,7 @@ msgid "Edit JPilot Entry"
 msgstr "Upravit JPilot soubor"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2144,7 +2144,7 @@ msgstr "Timeout (vteřin)"
 msgid "Maximum Entries"
 msgstr "Maximum položek"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Základní"
 
@@ -2201,7 +2201,7 @@ msgid "Exporting file:"
 msgstr "Exportovaný soubor:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr " Vybrat... "
 
@@ -2657,135 +2657,145 @@ msgstr "Konec"
 msgid "Sylpheed: %d new messages"
 msgstr "Dokončeno (%d nová(é) zpráva(y))"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Autentizuji"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Načítám nové zprávy"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "V pohotovosti"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Zrušeno"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Načítám"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hotovo (%d zpráv(a) (%s) přijato)"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "Hotovo (Nejsou žádné nové zprávy)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Autentizace selhala"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Zamknuto"
 
-#: src/inc.c:596
+#: src/inc.c:635
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (vteřin)"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Dokončeno (%d nová(é) zpráva(y))"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Dokončeno (nejsou nové zprávy)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "Během načítání zpráv se vyskytly chyby."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "Získávám nové zprávy z účtu %s ...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Autentizuji"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Načítám nové zprávy"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Připojuji se na POP3 server: %s ..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nemohu se spojit s POP3 serverem: %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Autentizuji..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Získávám zprávy z %s do %s...\n"
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Zjišťuji počet nových zpráv (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Zjišťuji počet nových zpráv (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Zjišťuji počet nových zpráv (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Zjišťuji počet zpráv (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "Vymazávám zprávu %d"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Ukončuji"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Načítám zprávu (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Hotovo (%d zpráv(a) (%s) přijato)"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 #, fuzzy
 msgid "Connection failed."
 msgstr "Spojení selhalo"
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "Během zpracovávání pošty se vyskytla chyba ."
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2794,28 +2804,28 @@ msgstr ""
 "Během zpracovávání pošty se vyskytla chyba:\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Nezbylo žádné místo na disku."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "Nemohu zapisovat do souboru."
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "Chyba soketu."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "Poštovní schránka je zamčena."
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2824,11 +2834,11 @@ msgstr ""
 "Poštovní schránka je zamčena:\n"
 "%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 msgid "Authentication failed."
 msgstr "Autentikace selhala."
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2837,16 +2847,16 @@ msgstr ""
 "Autentikace selhala:\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 #, fuzzy
 msgid "Session timed out."
 msgstr "vypršel čas relace\n"
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "Začleňování zrušeno\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Načítám nové zprávy z %s do %s...\n"
@@ -3754,7 +3764,7 @@ msgstr "Začlení novou poštu ze všech účtů"
 msgid "Send queued message(s)"
 msgstr "Odešle pozdrženou zprávu(y)"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Napsat"
@@ -4095,224 +4105,224 @@ msgstr ""
 "Špatná passphrase! Zkuste to znovu...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Otevření okna s nastavením účtu...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Účet%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Nastavení pro nový účet"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Nastavení účtu"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Vyvolání okna pro nastavení účtu...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Příjem"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Soukromí"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Rozšíření"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Název tohoto účtu"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "Nastavit jako výchozí"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Osobní informace"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Celé jméno"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "Poštovní adresa"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Organizace"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Informace o serveru"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Žádný (místní)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentizaci"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "News server"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Server pro příjem"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "SMTP server (odesílání)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "Uživatelské jméno"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Heslo"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Tento server vyžaduje autentizaci"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Smazat zprávy na serveru po jejich přijmutí"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Odstranit po"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "dnech"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dnů: odstranit ihned)"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Přijmout všechny zprávy ze serveru"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Limit velikosti pro příjem"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Filtr zpráv pro příjem"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Výchozí inbox"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nefiltrované zprávy budou uloženy v této složce)"
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Metoda autentizace"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "Diskuzní skupiny"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maximální počet příspěvků pro stažení\n"
 "(0 pro neomezený počet)"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Není uveden příjemce."
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "Při volbě 'Stáhnout vše' zjistit nové zprávy"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Záhlaví"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Přidat do záhlaví pole s datumem"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Generovat číslo zprávy"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Přidat uživatelsky definované záhlaví"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " Upravit..."
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Autentizace"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP autentizace (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4325,191 +4335,191 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentizace s POP3 před posláním"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 msgid "Command output"
 msgstr "Výstup příkazu"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastavit následující adresy"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Kopie"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Slepá kopie"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Odpovědět komu"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Vždy přidat podpis"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Vždy zašifrovat zprávu"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "Použít formát ASCII-armored pro zašifrování"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Použít čistý textový podpis"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Klíč pro podpis"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Použít výchozí GnuPG klíč"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Vybrat klíč podle email adresy"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Zadat klíč ručně"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "Uživatel nebo ID klíče:"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "Nepoužívat SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "Použít SSL pro POP3 spojení"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Použít příkaz STARTTLS pro spuštění SSL relace"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "Použít SSL pro IMAP4 spojení"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "Použít SSL pro NNTP připojení"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Odesílání (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "Použít SSL pro SMTP připojení"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "Určete SMTP port"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "Určete POP3 port"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "Určete IMAP4 port"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "Určete NNTP port"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Určete název domény"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "adresář pro IMAP server"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Přijmout všechny zprávy ze serveru"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Ukládat odeslané zprávy do"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Ukládat koncepty do"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Ukládat smazané zprávy do"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Ukládat smazané zprávy do"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "Nebylo zadáno jméno účtu."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "Nebyla zadána poštovní adresa."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "Nebyl zadán SMTP server."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "Nebylo zadáno uživatelské číslo."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "Nebyl zadán POP3 server."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "Nebyl zadán IMAP4 server."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "Nebyl zadán NNTP server."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6137,85 +6147,85 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "Fronta hlaviček zpráv je poškozená.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Posílám zprávu (%d / %d bytů)"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Nelze spustit externí příkaz: %s\n"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Během odesílání pošty se vyskytla chyba ."
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Připojení"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Připojuji se na SMTP server: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "Posílám HELO..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "Autentizuji"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 #, fuzzy
 msgid "Sending message..."
 msgstr "Posílám zprávu"
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "Posílám EHLO..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Posílám MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Odesílání"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Posílám RCPT TO..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Posílám DATA..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Ukončuji..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Posílám zprávu (%d / %d bytů)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Posílám zprávu"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "Při posílání zprávy nastala chyba."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/da.po b/po/da.po
index 564ef06e..72d9c166 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -691,7 +691,7 @@ msgstr ""
 msgid "Name"
 msgstr "Navn"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -1152,7 +1152,7 @@ msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Mappe"
@@ -1185,7 +1185,7 @@ msgstr "Note"
 msgid "Warning"
 msgstr "Advarsel"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Fejl"
 
@@ -1636,7 +1636,7 @@ msgstr ""
 "Konto til afsendelse af e-post er ikke valgt.\n"
 "Vælg konto før afsendelse er mulig."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
@@ -1741,7 +1741,7 @@ msgstr "MIME type"
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Send"
@@ -1783,7 +1783,7 @@ msgid "Attach file"
 msgstr "Vedhæft fil"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Underskrift"
@@ -1997,7 +1997,7 @@ msgid " Check File "
 msgstr " Check fil "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Fil"
 
@@ -2075,7 +2075,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redigér JPilot indtastning"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2140,7 +2140,7 @@ msgstr "Timeout (sek)"
 msgid "Maximum Entries"
 msgstr "Max. indtastninger"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Enkelt"
 
@@ -2197,7 +2197,7 @@ msgid "Exporting file:"
 msgstr "Eksporterer fil:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr " Vælg... "
 
@@ -2653,138 +2653,148 @@ msgstr "Slut"
 msgid "Sylpheed: %d new messages"
 msgstr "Hentet (%d nye meddelelse(r))"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Godkender"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Modtager nu meddelelse"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "Vent"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Afbrudt"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Modtager"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hentet (%d meddelelse(r) (%s)"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "Ingen nye meddelelser"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Forbindelse mislykkedes"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Godkendelse mislykkedes"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Låst"
 
-#: src/inc.c:596
+#: src/inc.c:635
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Hentet (%d nye meddelelse(r))"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Ingen nye meddelelser"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "Fejl ved hentning af e-post."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "modtager nye meddelelser fra konto %s...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Godkender"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: henter nye meddelelser"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Forbinder til POP3 server: %s ..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ingen forbindelse med POP3 server: %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Godkender..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Modtager meddelelse fra %s..."
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Modtager antal nye meddelelser (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Modtager antal nye meddelelser (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Modtager antal nye meddelelser (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Modtager antal nye meddelelser (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "Sletter meddelelse %d"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Afslutter"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Modtager meddelelse (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Henter (%d meddelelse(r), (%s) hentet"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 #, fuzzy
 msgid "Connection failed."
 msgstr "Forbindelse mislykkedes"
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 #, fuzzy
 msgid "Error occurred while processing mail."
 msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2793,29 +2803,29 @@ msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Ingen fri disk plads."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "Kan ikke skrive til fil."
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "Sokkel fejl."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "postkasse er låst\n"
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2824,11 +2834,11 @@ msgstr ""
 "Mailbox er låst:\n"
 "%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 msgid "Authentication failed."
 msgstr "Godkendelses fejlede."
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2837,16 +2847,16 @@ msgstr ""
 "Godkendelsesfejl:\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 #, fuzzy
 msgid "Session timed out."
 msgstr "tid udløbet\n"
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "Hentning afbrudt\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Modtager nye meddelelser fra %s til %s...\n"
@@ -3753,7 +3763,7 @@ msgstr "Hent ny post fra alle konti"
 msgid "Send queued message(s)"
 msgstr "Sender meddelelse(r) i kø"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Opret"
@@ -4094,222 +4104,222 @@ msgstr ""
 "Forkert adgangssætning! Prøv igen...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Åbner konti egenskaber...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Opsæt af ny konto"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Konto opsæt"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Opretter konto egenskaber...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Modtag"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Privat"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Navn på denne konto"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "Standard konto"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Personlige informationener"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Fuldt navn"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "E-post adresse"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Server data"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Ingen (lokal)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Dennes server kræver godkendelse"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "Nyheds server"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Server til modtagelse"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "SMTP server (afsendelse)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "Bruger ID"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Adgangskode"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Dennes server kræver godkendelse"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Slet meddelelser fra server efter modtagelse"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Slet efter"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "dage"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dage: slet straks)"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Hent alle meddelelser fra server"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Modtagelses størrelse maks."
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "kB"
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Filtrere meddelelse ved modtagelse"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Standard indbakke"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Ufiltrerede meddelelser gemmes i denne mappe)"
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Godkendelses metode"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "Nyheder"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr "Max antal artikler ved hentning (0 angiver alle)"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Mangler modtager"
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Hent alle' henter post fra denne konto"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Hoved"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Tilføj dato linie"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Opret meddelelses ID"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Tilføj bruger defineret hoved"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " Redigér... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Godkendelse"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP godkendelse (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4322,192 +4332,192 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Godkend med POP3 før afsendelse"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 msgid "Command output"
 msgstr "Kommando tekst"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Udfyld automatisk følgende adresser"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Svar til"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Signer altid meddelelse"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Krypter altid meddelelser"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "Benyt ASCII format til kodning"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Benyt klar tekst underskrift"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Underskrifts nøgle"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Benyt standard GnuPg nøgle"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Vælg nøgle efter e-post adresse"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Angiv nøgle manuelt"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "Bruger eller nøgle ID"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "Benyt ikke SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "Benyt SSL til POP3 forbindelse"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Benyt STARTTLS kommando til at starte SSL session"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "Benyt SSL til IMAP4 forbindelse"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "Benyt SSL til NNTP forbindelse"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Send (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "Benyt SSL til SMTP forbindelse"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr "Benyt ublokerende SSL"
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(Slp dette fra hvis du har problemer med SSL forbindelser)"
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "Angiv SMTP port"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "Angiv POP3 port"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "Angiv IMAP4 port"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "Angiv NNTP port"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Angiv domæne navn"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "IMAP server sti."
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Hent alle meddelelser fra server"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Gem sendte meddelelser i"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Gem kladde i"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Gem slettede meddelelser i"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Gem slettede meddelelser i"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "Konto navn er ikke angivet."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "E-post adresse ikke angivet."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "SMTP server ikke angivet."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "Bruger ID ikke angivet."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "POP3 server ikke angivet."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 server ikke angivet"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "NNTP server ikke angivet."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6133,87 +6143,87 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "Hoved ugyldigt på meddelelse i kø.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Sender meddelelse (%d / %d bytes)"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Kan ikke udføre ekstern kommando: %s\n"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Fejl ved afsendelse af e-post."
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Forbinder"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Forbindelse med SMTP server: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "Sender HELO..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "Godkender"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 msgid "Sending message..."
 msgstr "Sende meddelelse..."
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "Sender EHLO..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Sender MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Sender"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Sender RCPT TO..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Sender DATA..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Afslutter..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Sender meddelelse (%d / %d bytes)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Sende Meddelelse"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 #, fuzzy
 msgid "Error occurred while sending the message."
 msgstr ""
 "Fejl ved afsendelse meddelelse:\n"
 "%s"
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/de.po b/po/de.po
index 44e864cd..935d8488 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+0900\n"
 "PO-Revision-Date: 2006-09-27 16:27+0100\n"
 "Last-Translator: Frank Lanitz <frank@frank.uvena.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -696,7 +696,7 @@ msgstr ""
 msgid "Name"
 msgstr "Name"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -1159,7 +1159,7 @@ msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Ablage"
@@ -1192,7 +1192,7 @@ msgstr "Notiz"
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Fehler"
 
@@ -1604,7 +1604,7 @@ msgstr ""
 "Account zum Versenden von E-Mails, wurde nicht angegeben.\n"
 "Bitte wählen sie einen E-Mail-Account vor dem Senden."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fehler beim Senden der Nachricht an %s ."
@@ -1715,7 +1715,7 @@ msgstr "MIME-Typ"
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Senden"
@@ -1757,7 +1757,7 @@ msgid "Attach file"
 msgstr "Datei anhängen"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Unterschrift"
@@ -1964,7 +1964,7 @@ msgid " Check File "
 msgstr " Datei überprüfen "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Datei"
 
@@ -2042,7 +2042,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot-Eintrag bearbeiten"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2107,7 +2107,7 @@ msgstr "Timeout (Sek.)"
 msgid "Maximum Entries"
 msgstr "Einträge (Max.)"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Einfach"
 
@@ -2164,7 +2164,7 @@ msgid "Exporting file:"
 msgstr "Exportiere Datei:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr " Auswählen... "
 
@@ -2614,133 +2614,143 @@ msgstr "Ende"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d neue Nachricht(en)"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Beglaubigen"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Empfange neue Nachricht"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "Warten"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Empfange"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Fertig (%d Nachricht(en) (%s) empfangen)"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "Fertig (keine neuen Nachrichten)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Beglaubigung fehlgeschlagen"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Blockiert"
 
-#: src/inc.c:596
+#: src/inc.c:635
 msgid "Timeout"
 msgstr "Timeout"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Beendet (%d neue Nachricht(en))"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Beendet (keine neuen Nachrichten)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "Fehler während des Empfanges der E-Mails."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "erhalte neue Nachrichten vom Account %s...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Beglaubigen"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Empfange neue Nachrichten"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Verbinde mit POP3-Server: %s..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Keine Verbindung mit POP3-Server: %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Beglaubigen..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Erhaltene Nachrichten von %s..."
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "Lösche Nachricht %d"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Beenden"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Empfange Nachricht (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Empfange (%d Nachricht(en) (%s) empfangen)"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 msgid "Connection failed."
 msgstr "Verbindung fehlgeschlagen."
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "Fehler beim Verarbeiten der E-Mail."
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2749,28 +2759,28 @@ msgstr ""
 "Fehler beim Verarbeiten der E-Mail:\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Kein Platz mehr auf der Festplatte."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "Kann Datei nicht schreiben."
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "Socket-Fehler."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr "Verbindung geschlossen vom Remote-Host."
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "Mailbox ist blockiert."
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2779,11 +2789,11 @@ msgstr ""
 "Mailbox ist gesperrt:\n"
 "%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 msgid "Authentication failed."
 msgstr "Beglaubigung fehlgeschlagen."
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2792,15 +2802,15 @@ msgstr ""
 "Beglaubigung fehlgeschlagen:\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr "Sitzungszeit abgelaufen."
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "Empfangen abgebrochen\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Erhalte neue Nachrichten von %s in %s...\n"
@@ -3673,7 +3683,7 @@ msgstr "Neue E-Mail aller Accounts aufnehmen"
 msgid "Send queued message(s)"
 msgstr "Senden wartender Nachrichten"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Verfassen"
@@ -4033,218 +4043,218 @@ msgstr ""
 "Falsches Mantra! Nochmal...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Öffne Accounteinstellungenfenster...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Einstellungen eines neuen Accounts"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Accounteinstellungen"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Erstelle Accounteinstellungenfenster...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Empfangen"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Privat"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Speziell"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Name dieses Accounts"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "Standard-Account"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Persönliche Informationen"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Vollständiger Name"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "E-Mail-Adresse"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Serverdaten"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Keiner (lokal)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Dieser Server benötigt Beglaubigung"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "Newsserver"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Server zum Empfangen"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "SMTP-Server (senden)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "Benutzer-ID"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Kennwort"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 msgid "Use secure authentication (APOP)"
 msgstr "Verwende sichere Beglaubigung (APOP)"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Nachrichten vom Server nach Empfang löschen"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Entfernen nach"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "Tag(en)"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 msgid "0 days: remove immediately"
 msgstr "0 Tage: sofort entfernen"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Lade alle Nachrichten vom Server herunter"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Grenze für Nachrichtengöße beim Empfang"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Nachrichten beim Empfang filtern"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Standard Posteingang"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Ungefilterte Nachrichten werden in dieser Ablage gespeichert."
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Beglaubigungsmethode"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 msgid "Only check INBOX on receiving"
 msgstr "Prüfe INBOX nur beim Empfang"
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 msgid "Maximum number of articles to download"
 msgstr "Maximum an herunterzuladenden Artikeln"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 msgid "No limit if 0 is specified."
 msgstr "Ohne Begrenzung, wenn 0 angegeben"
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr ""
 "`Hole alle' übeprüft ob neue Nachrichten für diesen Account vorhanden sind"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Kopfzeilen"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Füge Datum in Kopfzeile ein"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Erzeuge Nachrichten-ID"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Füge benutzerdefinierte Kopfzeile ein"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " Bearbeiten... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Beglaubigung"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-Beglaubigung (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4256,189 +4266,189 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Beglaubige mit POP3 vor dem Senden"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 msgid "Command output"
 msgstr "Befehlsausgabe"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Setze folgende Adressen automatisch"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Nachrichten immer digital unterschreiben"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Nachrichten immer verschlüsseln"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr "Verschlüssele beim Antworten auf verschlüsselte Nachricht"
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "Benutze ASCII-Hüllen Format zum Verschlüsseln"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Benutze digitale Klartext-Unterschrift"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Schlüssel für digitale Unterschrift"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Benutze voreingestellten GnuPG-Schlüssel"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Wähle Schlüssel nach E-Mail Adresse"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Schlüssel manuell angeben"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "Benutzer- oder Schlüssel-ID"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "SSL nicht benutzen"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "SSL für POP3-Verbindung benutzen"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Für SSL-Sitzung STARTTLS-Befehl benutzen"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL für IMAP4-Verbindung benutzen"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "SSL für NNTP-Verbindung benutzen"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Senden (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "SSL für SMTP-Verbindung benutzen"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr "Benutze non-blocking SSL"
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Ausschalten, wenn Probleme mit der SSL-Verbindung."
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "SMTP-Port angeben"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "POP3-Port angeben"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "IMAP4-Port angeben"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "NNTP-Port angeben"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Domännamen angeben"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "IMAP-Serververzeichnis."
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Nur die Unterablagen dieses Verzeichnisses werden angezeigt."
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 msgid "Clear all message caches on exit"
 msgstr "Alle Nachrichtenzwischenspeicher beim Beenden leeren"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Gesendete Nachrichten speichern in"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Entwürfe speichern in"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 msgid "Put queued messages in"
 msgstr "Nachrichten der Warteschlange speichern in"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Gelöschte Nachrichten speichern in"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "Keine Account-Name angegeben."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "Keine E-Mail-Adresse angegeben."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "Keinen SMTP-Server angegeben."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "Keine Benutzer-ID angegeben."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "Keinen POP3-Server angegeben."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "Keinen IMAP4-Server angegeben."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "Keinen NNTP-Server angegeben."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr "Ausgewählte Ablage ist keine Warteschlangen-Ablage."
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6011,84 +6021,84 @@ msgstr ""
 "sicher sein, dass sie an die von Ihnen vorgesehene Person geht.\n"
 "Vertrauen Sie ihm genug, um ihn trotzdem zu verwenden?"
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "Kopfzeilen wartender Nachricht ist defekt.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Sende Nachricht mit dem Befehl %s\n"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Kann den Befehl %s nicht ausführen"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Fehler aufgetreten beim Senden des Befehls %s"
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Verbinde"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Verbindung mit SMTP-Server: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "Sende HELO..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "Beglaubigen"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 msgid "Sending message..."
 msgstr "Sende Nachricht..."
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "Sende EHLO..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Sende MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Sende"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Sende RCPT TO..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Sende DATA..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Beende..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Sende Nachricht (%d / %d bytes)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Sende Nachricht"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "Fehler aufgetreten beim Senden der Nachricht."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/el.po b/po/el.po
index dcd0f0f9..d26fcf0b 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+0900\n"
 "PO-Revision-Date: 2001-10-08\n"
 "Last-Translator: Michalis Kabrianis <Michalis@bigfoot.com>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -701,7 +701,7 @@ msgstr ""
 msgid "Name"
 msgstr "Όνομα"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Πρωτόκολλο"
 
@@ -1160,7 +1160,7 @@ msgid "Group"
 msgstr "ΝέαΟμάδα"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Κατάλογος"
@@ -1195,7 +1195,7 @@ msgstr "Σημείωση"
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -1659,7 +1659,7 @@ msgstr ""
 "Ο λογαριασμός για αποστολή μηνύματος δεν έχει οριστεί.\n"
 "Παρακαλώ επιλέξτε ένα λογαριασμό πριν στείλετε."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Συνέβη σφάλμα κατά την αποστολή του μηνύματος σε %s ."
@@ -1762,7 +1762,7 @@ msgstr "τύπος MIME"
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Αποστολή"
@@ -1806,7 +1806,7 @@ msgid "Attach file"
 msgstr "Προσάρτηση αρχείου"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Yπογραφή"
@@ -2026,7 +2026,7 @@ msgid " Check File "
 msgstr " Έλεγχος Αρχείου "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Αρχείο"
 
@@ -2106,7 +2106,7 @@ msgid "Edit JPilot Entry"
 msgstr "Επεξεργασία εγγραφής JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2172,7 +2172,7 @@ msgstr ""
 msgid "Maximum Entries"
 msgstr "Μέγιστος αριθμός εγγραφών"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Βασικά"
 
@@ -2233,7 +2233,7 @@ msgid "Exporting file:"
 msgstr "Εξαγωγή αρχείου:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr "Επιλογή... "
 
@@ -2711,196 +2711,206 @@ msgstr ""
 msgid "Sylpheed: %d new messages"
 msgstr "\t%d νέο(α) μήνυμα(μηνύματα)\n"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Πιστοποίηση"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Λαμβάνω τα νέα μηνύματα"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "Περιμένω"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Ακυρώθηκε"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Λαμβάνω"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, fuzzy, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Διαγραφή μηνυμάτων από τον εξυπηρέτη όταν παραληφθούν"
 
-#: src/inc.c:574
+#: src/inc.c:613
 #, fuzzy
 msgid "Done (no new messages)"
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "H πιστοποίηση απέτυχε"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:596
+#: src/inc.c:635
 msgid "Timeout"
 msgstr ""
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, fuzzy, c-format
 msgid "Finished (%d new message(s))"
 msgstr "\t%d νέο(α) μήνυμα(μηνύματα)\n"
 
-#: src/inc.c:649
+#: src/inc.c:688
 #, fuzzy
 msgid "Finished (no new messages)"
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/inc.c:658
+#: src/inc.c:697
 #, fuzzy
 msgid "Some errors occurred while getting mail."
 msgstr "συνέβη σφάλμα καθώς λάμβανα την αλληλογραφία."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "λαμβάνω νέα μηνύματα του λογαριασμού %s...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Πιστοποίηση"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Λαμβάνω τα νέα μηνύματα"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Συνδέομαι στον POP3 server: %s ..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Δεν μπορώ να συνδεθώ στον POP3 server: %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Πιστοποίηση"
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Λαμβάνω τα μηνύματα από το %s στο %s...\n"
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Λαμβάνω τον αριθμό των νέων μηνυμάτων (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Λαμβάνω τον αριθμό των νέων μηνυμάτων (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Λαμβάνω τον αριθμό των νέων μηνυμάτων (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Λαμβάνω το μέγεθος των μηνυμάτων (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, fuzzy, c-format
 msgid "Deleting message %d"
 msgstr "Διαγράφω το μήνυμα"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Κλείνω τη σύνδεση"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Λαμβάνω το μήνυμα (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Διαγραφή μηνυμάτων από τον εξυπηρέτη όταν παραληφθούν"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 #, fuzzy
 msgid "Connection failed."
 msgstr "Η σύνδεση απέτυχε"
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Δεν υπάρχει άλλος χώρος στο δίσκο."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 #, fuzzy
 msgid "Can't write file."
 msgstr "Δεν μπορώ να γράψω σε αρχείο.\n"
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 #, fuzzy
 msgid "Socket error."
 msgstr "σφάλμα πρωτοκόλλου\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "Ρυθμίσεις Mailbox"
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Ρυθμίσεις Mailbox"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Πιστοποίηση"
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Πιστοποίηση"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 #, fuzzy
 msgid "Incorporation cancelled\n"
 msgstr "Λήψη νέου mail"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Λαμβάνω νέα μηνύματα από το %s στο %s...\n"
@@ -3881,7 +3891,7 @@ msgstr "Λήψη νέου mail από όλους τους λογαριασμού
 msgid "Send queued message(s)"
 msgstr "Αποστολή όλων των μηνυμάτων από την ουρά"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Σύνθεση"
@@ -4230,232 +4240,232 @@ msgstr ""
 "Λάθος κωδική φράση! Ξαναπροσπαθήστε...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Ανοίγω το παράθυρο επιλογών των λογαριασμών...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Λογαριασμός%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Επιλογές για το νέο λογαριασμό"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 #, fuzzy
 msgid "Account preferences"
 msgstr "Κοινές Επιλογές"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Δημιουργώ το παράθυρο επιλογών του λογαριασμού...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Λήψη"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Μυστικότητα"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Προχωρημένα"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Όνομα του λογαριασμού"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 #, fuzzy
 msgid "Set as default"
 msgstr " Θέσε ως σύνηθη λογαριασμό "
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Προσωπικές πληροφορίες"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Πλήρες όνομα"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "Διεύθυνση mail"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Οργανισμός"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Πληροφορίες εξυπηρέτη"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "Νέα (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Τίποτα (τοπικό)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Αυτός ο εξυπηρέτης απαιτεί πιστοποίηση"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "Εξυπηρέτης νέων"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Εξυπηρέτης για λήψη"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "Εξυπηρέτης SMTP (αποστολή)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "Όνομα χρήστη"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Κωδικός"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Αυτός ο εξυπηρέτης απαιτεί πιστοποίηση"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Διαγραφή μηνυμάτων από τον εξυπηρέτη όταν παραληφθούν"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 #, fuzzy
 msgid "Remove after"
 msgstr "Αφαίρεση καταλόγου"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 #, fuzzy
 msgid "days"
 msgstr "Πάντα"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 msgid "0 days: remove immediately"
 msgstr ""
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Λήψη όλων των μηνυμάτων από τον εξυπηρέτη"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 #, fuzzy
 msgid "Receive size limit"
 msgstr "Εμφάνιση διαλόγου λήψης"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Φιλτράρισμα μηνυμάτων κατά την λήψη"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 #, fuzzy
 msgid "Default inbox"
 msgstr "Προκαθορισμένο κλειδί υπογραφής"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr ""
 "Άνοιγμα του πρώτου αδιάβαστου μηνύματος κατά τη μετακίνηση σε ένα κατάλογο"
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 #, fuzzy
 msgid "Authentication method"
 msgstr "Πιστοποίηση"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Αυτόματη"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "Νέα"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Μέγιστος αριθμός άρθρων που θα ληφθούν\n"
 "(χωρίς όριο αν θέσετε 0)"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Ο παραλήπτης δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 #, fuzzy
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Λήψη όλων' ελέγχει για νέα μηνύματα σε αυτό το λογαριασμό"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Επικεφαλίδα"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Προσθήκη πεδίου ημερομηνίας στην κεφαλίδα"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Δημιουργία Message-ID"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Προσθήκη κεφαλίδας ορισμένης από τον χρήστη"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr "Επεξεργασία..."
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Πιστοποίηση"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Πιστοποίηση SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4465,199 +4475,199 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Πιστοποίηση με POP3 πριν την αποστολή"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 #, fuzzy
 msgid "Command output"
 msgstr "Εντολή"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 #, fuzzy
 msgid "Automatically set the following addresses"
 msgstr "Αυτόματος ορισμός αυτών των διευθύνσεων"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Κοινοποίηση"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Απάντηση σε"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Υπογραφή μηνυμάτων εξ ορισμού"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Κρυπτογράφηση μηνυμάτων εξ ορισμού"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 #, fuzzy
 msgid "Use clear text signature"
 msgstr "Εισαγωγή υπογραφής"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Κλειδί υπογραφής"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Χήση προκαθορισμένου κλειδιού GnuPG"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Επιλογή κλειδιού με βάση την email διεύθυνση"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Ορίστε με το χέρι το κλειδί"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "Χρήστης ή key ID:"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "Να μην χρησιμοποιείται SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "Χρήση SSL για σύνδεση POP3"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Χρήση εντολής STARTTLS για την έναρξη ασφαλούς (SSL) συνόδου"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "Χρήση SSL για σύνδεση IMAP4"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 #, fuzzy
 msgid "Use SSL for NNTP connection"
 msgstr "Χρήση SSL για σύνδεση SMTP"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Αποστολή (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "Χρήση SSL για σύνδεση SMTP"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "Προσδιορισμός θύρας SMTP"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "Προσδιορισμός θύρας POP3"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "Προσδιορισμός θύρας IMAP4"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "Προσδιορισμός θύρας NNTP"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Ορισμός του ονόματος του domain"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "Κατάλογος στον εξυπηρέτη IMAP4"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Λήψη όλων των μηνυμάτων από τον εξυπηρέτη"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 #, fuzzy
 msgid "Put sent messages in"
 msgstr "Αποθήκευση σταλμένων μηνυμάτων στο outbox"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 #, fuzzy
 msgid "Put draft messages in"
 msgstr "Τύλιξη μηνυμάτων στους"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 #, fuzzy
 msgid "Put deleted messages in"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 #, fuzzy
 msgid "Account name is not entered."
 msgstr "Η διεύθυνση mail δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "Η διεύθυνση mail δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "Ο εξυπηρέτης SMTP δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "Το όνομα χρήστη δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "Ο εξυπηρέτης POP3 δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "Ο εξυπηρέτης IMAP4 δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "Ο εξυπηρέτης NNTP δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6287,88 +6297,88 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "Η κεφαλίδα του εν αναμονή μηνύματος δεν είναι πλέον έγκυρη.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Στέλνω το μήνυμα (%d / %d bytes)"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Δεν μπόρεσα να εκτελέσω την εξωτερική εντολή: %s\n"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Συνδέομαι"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Σύνδεση στην εξυπηρέτη SMTP: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 #, fuzzy
 msgid "Sending HELO..."
 msgstr "Στέλνω MAIL FROM..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 #, fuzzy
 msgid "Authenticating"
 msgstr "Πιστοποίηση"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 #, fuzzy
 msgid "Sending message..."
 msgstr "Αποστολή μηνύματος"
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 #, fuzzy
 msgid "Sending EHLO..."
 msgstr "Στέλνω MAIL FROM..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Στέλνω MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Στέλνω"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Στέλνω RCPT TO..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Στέλνω DATA..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Εγκαταλείπω..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Στέλνω το μήνυμα (%d / %d bytes)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Αποστολή μηνύματος"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "Συνέβη σφάλμα κατά την αποστολή του μηνύματος."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/es.po b/po/es.po
index fcddbcf8..1e9dc086 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+0900\n"
 "PO-Revision-Date: 2006-07-29 00:32+0100\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -692,7 +692,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nombre"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -1154,7 +1154,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Carpeta"
@@ -1187,7 +1187,7 @@ msgstr "Notificación"
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Error"
 
@@ -1599,7 +1599,7 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta antes de enviar."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hubo un error enviando el mensaje a %s ."
@@ -1707,7 +1707,7 @@ msgstr "Tipo MIME"
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Enviar"
@@ -1749,7 +1749,7 @@ msgid "Attach file"
 msgstr "Adjuntar fichero"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Firma"
@@ -1956,7 +1956,7 @@ msgid " Check File "
 msgstr " Comprobar fichero "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Fichero"
 
@@ -2034,7 +2034,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2099,7 +2099,7 @@ msgstr "Tiempo límite (seg.)"
 msgid "Maximum Entries"
 msgstr "Nº entradas máximas"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Básico"
 
@@ -2157,7 +2157,7 @@ msgid "Exporting file:"
 msgstr "Fichero de exportación:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr "Seleccionar..."
 
@@ -2606,133 +2606,143 @@ msgstr "Finalizar"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d mensajes nuevos"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Autentificando"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Obteniendo nuevos mensajes"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hecho (%d mensaje(s) (%s) recibido(s))"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "Hecho (no hay mensajes nuevos)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Conexión fallida"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Authorización fallida"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:596
+#: src/inc.c:635
 msgid "Timeout"
 msgstr "Tiempo límite"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finalizado (%d mensaje(s) nuevo(s))"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Finalizado (no hay mensajes nuevos)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "Hubo algún error obteniendo el correo."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obteniendo nuevos mensajes de la cuenta %s...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Autentificando"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando nuevos mensajes"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando al servidor POP3: %s..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "No se puede conectar al servirdor POP3: %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Autentificando..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obteniendo mensajes desde %s..."
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obteniendo el número de nuevos mensajes (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obteniendo el número de nuevos mensajes (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obteniendo el número de nuevos mensajes (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obteniendo el tamaño de nuevos mensajes (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "Borrando mensaje %d"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Saliendo"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaje (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Obteniendo (%d mensaje(s) (%s) recibido(s))"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 msgid "Connection failed."
 msgstr "Conexión fallida."
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "Hubo un error mientras se procesaba el correo."
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2741,28 +2751,28 @@ msgstr ""
 "Hubo un error procesando el correo:\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "No hay espacio libre en disco."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "No se puede escribir el fichero."
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "Error de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr "Conexión cerrada por la máquina remota."
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "El buzón esta bloqueado."
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2771,11 +2781,11 @@ msgstr ""
 "El buzón está bloqueado:\n"
 "%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 msgid "Authentication failed."
 msgstr "La autentificación falló."
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2784,15 +2794,15 @@ msgstr ""
 "La autentificación falló:\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr "Se agotó el tiempo de espera de la sesión."
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obteniendo nuevos mensajes desde %s en %s...\n"
@@ -3666,7 +3676,7 @@ msgstr "Incorporar correo nuevo de todas las cuentas"
 msgid "Send queued message(s)"
 msgstr "Enviar mensaje(s) en la cola"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Componer"
@@ -4026,217 +4036,217 @@ msgstr ""
 "¡Contraseña errónea! Intentelo de nuevo...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Abriendo ventana de preferencias de cuenta...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Cuenta%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Preferencias para una nueva cuenta"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Preferencias de la cuenta"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Creando ventana de preferencias de cuenta...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Avanzadas"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Nombre de esta cuenta"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "Cuenta por defecto"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Información personal"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Nombre completo"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "Dirección de correo"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Organización"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Información del servidor"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "Noticias (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Ninguna (local)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Este servidor requiere autentificación"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "Servidor de news"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Servidor de recepción"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "Usuario"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Contraseña"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 msgid "Use secure authentication (APOP)"
 msgstr "Usar autentificación segura (APOP)"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Eliminar los mensajes del servidor al recibir"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Eliminar después de"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "días"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 msgid "0 days: remove immediately"
 msgstr "0 días: eliminar inmediatamente"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Descargar todos los mensajes del servidor"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Tamaño límite para recibir"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "Kb"
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensajes al recibir"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Buzón por defecto"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Los mensajes sin filtrar se guardarán en esta carpeta."
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Método de autentificación"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Automática"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 msgid "Only check INBOX on receiving"
 msgstr "Sólo comprobar Entrada al recibir"
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "Noticias"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artículos a descargar"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 msgid "No limit if 0 is specified."
 msgstr "Sin límite si se especifica 0."
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Traer todo' comprueba si hay mensajes nuevos en esta cuenta"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Cabecera"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Añadir campo Fecha"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Generar ID-Mensaje"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Añadir cabecera de usuario"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " Editar... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Autentificación"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentificación SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4248,189 +4258,189 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentificación con POP3 antes de enviar"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 msgid "Command output"
 msgstr "Salida de la orden"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Establecer las siguientes direcciones automáticamente"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Firmar el mensaje por defecto"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Encriptar el mensaje por defecto"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr "Encriptar al responder a un mensaje cifrado"
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "Usar formato ASCII blindado para encriptación"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Usar firma de texto claro"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Firmar clave"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Usar clave GnuPG por defecto"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Seleccionar clave por dirección de correo"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Especificar clave manualmente"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "Usuario o ID clave:"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "No usar SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "Usar SSL para la conexión POP3"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usar el mandato STARTTLS para abrir la sesión SSL"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usar SSL para la conexión IMAP4"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para la conexión NNTP"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "Usar SSL para la conexión SMTP"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr "Utilizar SSL no bloqueante"
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Deshabilítelo si tiene problemas con la conexión SSL."
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "Puerto SMTP"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "Puerto POP3"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "Puerto IMAP4"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "Puerto NNTP"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Nombre del dominio"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "Directorio del servidor IMAP4"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Sólo se mostrarán las subcarpetas de este directorio."
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 msgid "Clear all message caches on exit"
 msgstr "Limpiar todas las caches de mensajes al salir"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Poner mensajes enviados en"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Poner borradores de mensajes en"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 msgid "Put queued messages in"
 msgstr "Poner mensajes para la cola en"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Poner mensajes borrados en"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "No se especificó el nombre de cuenta."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "No se especificó la dirección de correo."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "No se especificó el servidor SMTP."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "No se especificó el usuario."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "No se especificó el servidor POP3."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "No se especificó el servidor IMAP4."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "No se especificó el servidor NNTP."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr "La carpeta especificada no es una carpeta de cola."
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5988,84 +5998,84 @@ msgstr ""
 "si llegará a la persona a la que lo quiere enviar.\n"
 "¿Es suficientemente fiable para usarla de todas maneras?"
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "Cabecera corrupta en el mensaje en cola.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Enviando mensaje usando la orden: %s\n"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "No se puede ejecutar la orden: %s"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Hubo un error ejecutando la orden: %s"
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Conectando con el servidor SMTP: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "Autentificando"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 msgid "Sending message..."
 msgstr "Enviando mensaje..."
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Enviando"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Enviando DATA..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Terminando..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando mensaje (%d / %d bytes)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "Hubo un error enviando el mensaje."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/et.po b/po/et.po
index 65dee3fa..a0e79b75 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+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"
@@ -695,7 +695,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nimi"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -1159,7 +1159,7 @@ msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Kaust"
@@ -1192,7 +1192,7 @@ msgstr "Märkus"
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Viga"
 
@@ -1644,7 +1644,7 @@ msgstr ""
 "Kirja saatmiseks pole määratud kasutajtunnust.\n"
 "Palun vali kirja konto enne saatmist."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Tekkis viga kirja saatmisel %s-le."
@@ -1749,7 +1749,7 @@ msgstr "MIME tüüp"
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Saada"
@@ -1791,7 +1791,7 @@ msgid "Attach file"
 msgstr "Manusta fail"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Allkiri"
@@ -2006,7 +2006,7 @@ msgid " Check File "
 msgstr " Kontrolli faili "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Fail"
 
@@ -2084,7 +2084,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redigeeri JPilot sissekannet"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2149,7 +2149,7 @@ msgstr "Ajalimiit (sek)"
 msgid "Maximum Entries"
 msgstr "Sissekannete piirarv"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Baas"
 
@@ -2206,7 +2206,7 @@ msgid "Exporting file:"
 msgstr "Väljastatav fail:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr " Vali... "
 
@@ -2665,192 +2665,202 @@ msgstr "Soome"
 msgid "Sylpheed: %d new messages"
 msgstr "Lõpetatud (%d uut kirja)"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Autoriseerimine"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Võtan uusi kirju"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "*Juures"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Katkestatud"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Tirin"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Valmis (%d kirja (%s)-st võetud)"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "Valmis (uusi kirju pole)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Ühendus ebaõnnestus"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Autoriseerimine ebaõnnestus"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Lukustatud"
 
-#: src/inc.c:596
+#: src/inc.c:635
 #, fuzzy
 msgid "Timeout"
 msgstr "Ajalimiit (sek)"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Lõpetatud (%d uut kirja)"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Lõpetatud (uusi kirju pole)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "Tekksiid mõned vead kirjade võtmisel."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "võtan uued kirjad kontolt %s...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Autoriseerimine"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Uute kirjade võtmine"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Ühendan POP3 serveriga: %s ..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ei suuda ühenduda POP3 serveriga %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Autoriseerin..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Võtan uute kirjade arvu (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Võtan kirjade suuruse (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "Kustutan kirja %d"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Väljun"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Võtan kirja (%d /%d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Valmis (%d kirja (%s)-st võetud)"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 #, fuzzy
 msgid "Connection failed."
 msgstr "Ühendus ebaõnnestus"
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Ketas täis."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 #, fuzzy
 msgid "Can't write file."
 msgstr "Ei saa kirjutada faili.\n"
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 #, fuzzy
 msgid "Socket error."
 msgstr "Soketi viga\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "Sissekanne peatatud\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Võtame uued teated %s-ist %s-i.\n"
@@ -3757,7 +3767,7 @@ msgstr "Võta kõigilt kontodelt uued kirjad"
 msgid "Send queued message(s)"
 msgstr "Saada kirjad järjekorrast"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Kirjuta"
@@ -4098,224 +4108,224 @@ msgstr ""
 "Vale parool! Proovi uuesti...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Avan konto parameetrite akent...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Uue konto omadused"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Konto omadused"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Loon konto omaduste akent...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Saabuvad kirjad"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Privaatsus"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Spetsiaalne"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Selle konto nimi"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr " Määra vaikimisi kontoks "
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Isiku informatsioon"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Täisnimi"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "E-Posti aadress"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Ofganisatsioon"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Serveri informatsioon"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "Uudised (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Lokaalarvutist"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "See servar nõuab autoriseerimist"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "Uudiste server"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Sissetulevate kirjade server"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "Saatmise server (SMTP)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "Kasutajanimi"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Parool"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "See servar nõuab autoriseerimist"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Kustuta kirjad pärast kohalejõudmist serverist"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Eemalda pärast"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "päeva"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 päeva: eemalda kohe)"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Võta serverist kõik kirjad"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Tõmbamise suuruse limiit"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Filtreeri saabuvaid kirju"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Vaikimisi sisendkast"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Filtreerimata kirjad salvestatakse sellesse kausta)"
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Autoriseerimise meetod"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "Uudised"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maksimaalne võetavate artiklite arv\n"
 "(määramata kui sisestate 0)"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Saaja pole määratud."
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "Kui vajutate nuppu 'Võta kõik', siis uusi kirju võetakse ka siia"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Päis"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Lisa kuupäev päisesse"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Loo Kirja-ID"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Lisa kasutaja defineeritud päis"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " Redigeeri... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Autoriseerimine"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Autoriseerimine (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4328,192 +4338,192 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Autoriseeri POP3 enne saatmist"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 #, fuzzy
 msgid "Command output"
 msgstr "Käsklus"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Säti järgmised aadressid automaatselt"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Vastus saata"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Vaikimisi tuleb kiri allkirjastada"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Vaikimisi tuleb kiri krüpteerida"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "Kasuta ASCII-ga varustatud krüpteerimise formaati"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Kasuta seleget teksti allkirja"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Allkirja võti"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Kasuta algset GnuPG võtit"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Vali võti elektronposti aadressi juurest"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Määra võti käsitsi"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "Kasutaja või võtme ID:"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "Ära kasuta SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "Kasuta SSL-i POP3-e ühenduse jaoks"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Kasuta STARTTLS käsklust et alustada SSL sessiooni"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "Kasuta SSL-i IMAP4-ja ühenduse jaoks"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "Kasuta SSL-i NNTP ühenduse loomisel"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Saada (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "Kasuta SSL-i SMTP ühenduse jaoks"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "Määra SMTP port"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "Määra POP3 port"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "Määra IMAP4 port"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "Määra NNTP port"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Määra domeeni nimi"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "IMAP serveri kataloog"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Võta serverist kõik kirjad"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Pane saadetud kirjad"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Pane mustandi kirjad"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Pane kustutatud kirjad"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Pane kustutatud kirjad"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "Konto nime ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "Postiaadressi ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "SMTP serverit ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "Kasutajanime ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "POP3 serverit ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 serverit ei ole sisestatud"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "NNTP serverit ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6138,88 +6148,88 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "Järjekorda seatud kirja päis on katki.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Saadan kirja (%d / %d baiti)"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Ei saanud välist käsklust käima: %s\n"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Ühendan"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Ühendun SMTP serveriga: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 #, fuzzy
 msgid "Sending HELO..."
 msgstr "Saadan KIRJA...."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 #, fuzzy
 msgid "Authenticating"
 msgstr "Autoriseerimine"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 #, fuzzy
 msgid "Sending message..."
 msgstr "Saadan kirja"
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 #, fuzzy
 msgid "Sending EHLO..."
 msgstr "Saadan KIRJA...."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Saadan KIRJA...."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Saadan"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Saadan RCPT..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Saadan andmed..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Väljun..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Saadan kirja (%d / %d baiti)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Saadan kirja"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "Kirja saatmisel tekkis viga."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/fr.po b/po/fr.po
index 9319696b..04dfcc2c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+0900\n"
 "PO-Revision-Date: 2006-02-23 00:32+0100\n"
 "Last-Translator: Nicolas Boos <nicolas.boos@wanadoo.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -704,7 +704,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nom"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Protocole"
 
@@ -1169,7 +1169,7 @@ msgid "Group"
 msgstr "Groupe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Dossier"
@@ -1202,7 +1202,7 @@ msgstr "Information"
 msgid "Warning"
 msgstr "Avertissement"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Erreur"
 
@@ -1617,7 +1617,7 @@ msgstr ""
 "Aucun compte n'a été spécifié pour l'envoi.\n"
 "Veuillez sélectionner un compte avant d'envoyer du courrier."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Une erreur est survenue lors de l'envoi du message à %s ."
@@ -1723,7 +1723,7 @@ msgstr "Type MIME"
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Envoyer"
@@ -1765,7 +1765,7 @@ msgid "Attach file"
 msgstr "Joindre un fichier"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Signature"
@@ -1974,7 +1974,7 @@ msgid " Check File "
 msgstr " Vérifier le fichier "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Fichier"
 
@@ -2053,7 +2053,7 @@ msgid "Edit JPilot Entry"
 msgstr "Édition de données JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2118,7 +2118,7 @@ msgstr "Délai d'attente (secs)"
 msgid "Maximum Entries"
 msgstr "Nombre maximal d'entrées"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Général"
 
@@ -2176,7 +2176,7 @@ msgid "Exporting file:"
 msgstr "Fichier mbox :"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr " Choisir... "
 
@@ -2629,133 +2629,143 @@ msgstr "Terminé"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed : %d nouveau(x) message(s)"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Authentification"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Récupération des nouveaux messages"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "Attente"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Annulé"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Récupération"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Terminé - %d message(s) %s reçu(s)"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "Terminé - pas de nouveau(x) message(s)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "La connexion a échoué"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "L'authentification a échoué"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Verrouillé"
 
-#: src/inc.c:596
+#: src/inc.c:635
 msgid "Timeout"
 msgstr "Délai d'attente"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Terminé - %d nouveau(x) message(s)"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Terminé - pas de nouveau(x) message(s)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "Erreur lors de la récupération des messages."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "Récupération des nouveaux messages du compte %s ...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Authentification"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Récupération des nouveaux messages"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Connexion au serveur POP3 : %s..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur POP3 : %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Authentification..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Réception des messages de %s..."
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Récupération du nombre de nouveaux messages (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Récupération du nombre de nouveaux messages (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Récupération du nombre de nouveaux messages (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Récupération de la taille des messages"
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "Suppression du message %d"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Fermeture"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Récupération du message (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Réception - %d message(s) %s reçu(s)"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 msgid "Connection failed."
 msgstr "La connexion a échoué."
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "Une erreur est survenue pendant le traitement du message."
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2764,28 +2774,28 @@ msgstr ""
 "Une erreur est survenue pendant le traitement du message :\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Plus de place disponible sur le disque."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "Impossible d'écrire dans le fichier."
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "Erreur de protocole."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr "La connexion a été fermée par le serveur."
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "Boîte verrouillée."
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2794,11 +2804,11 @@ msgstr ""
 "Boîte verrouillée :\n"
 "%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 msgid "Authentication failed."
 msgstr "L'authentification à échoué."
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2807,15 +2817,15 @@ msgstr ""
 "L'authentification a échoué :\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr "Dépassement du délai de réponse (timeout) de la session."
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "Relève du courrier annulée\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Récupération des nouveaux messages de %s dans %s...\n"
@@ -3699,7 +3709,7 @@ msgstr "Relever le courrier de tous les comptes"
 msgid "Send queued message(s)"
 msgstr "Envoyer les messages en attente"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Composer"
@@ -4060,217 +4070,217 @@ msgstr ""
 "Phrase secrète incorrecte. Autre tentative...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Ouverture de la fenêtre de configuration du compte...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Compte%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Configuration du nouveau compte"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Configuration du compte"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Création de la fenêtre de configuration du compte...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Réception"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Confidentialité"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Avancée"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Nom du compte"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "Définir comme compte par défaut"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Informations personnelles"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Nom complet"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "Adresse électronique"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Configuration des serveurs"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Aucun (local)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Ce serveur nécessite une authentification"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "Serveur de groupes de discussion"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Serveur de réception"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "Serveur SMTP (envoi)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "Nom de l'utilisateur"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Mot de passe"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 msgid "Use secure authentication (APOP)"
 msgstr "Utiliser l'authentification sécurisée (APOP)"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Suppression des messages du serveur après réception"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Supprimer après"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "jours"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 msgid "0 days: remove immediately"
 msgstr "0 jours : effacer immédiatement"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Réception de tous les messages sur le serveur"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Taille maximale pour la réception"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "Ko"
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Filtrage des messages à la réception"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Boîte de réception par défaut"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Les messages non filtrés seront placés dans ce dossier."
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Méthode d'authentification"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 msgid "Only check INBOX on receiving"
 msgstr "Vérifier seulement INBOX lors de la réception"
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "Articles de groupes de discussion"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 msgid "Maximum number of articles to download"
 msgstr "Nombre maximum d'articles à récupérer"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 msgid "No limit if 0 is specified."
 msgstr "Aucune limite pour la valeur 0."
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "« Tout relever » relève le courrier pour ce compte"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "En-tête"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Ajouter un champ « Date » à l'en-tête"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Génération d'un Message-ID"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Ajouter des en-têtes supplémentaires"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " Modifier... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Authentification"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Authentification SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4282,189 +4292,189 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "S'authentifier sur le POP3 avant l'envoi"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 msgid "Command output"
 msgstr "Sortie"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Définition automatique des adresses suivantes"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Copie"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Copie discrète"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Répondre à"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Signer le message par défaut"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Chiffrer le message par défaut"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr "Chiffrer les réponses à un message chiffré"
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "Utiliser le format ASCII-armé pour le chiffrement"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Utiliser une signature non chiffrée"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Clé de signature"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Utiliser la clé par défaut de GnuPG"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Sélectionner la clé en fonction de l'adresse électronique"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Indiquer manuellement la clé"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "Utilisateur ou identificateur (ID) de clé :"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "Ne pas utiliser SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "Utiliser SSL pour les connexions POP3"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Utiliser la commande STARTTLS pour commencer une session SSL"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "Utiliser SSL pour les connexions IMAP4"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "Utiliser SSL pour les connexions NNTP"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Envoi (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "Utiliser SSL pour les connexions SMTP"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr "Utiliser SSL non-bloquant"
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Désactivez ceci si vous rencontrez des problèmes de connexion SSL."
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "Indiquer le port SMTP"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "Indiquer le port POP3"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "Indiquer le port IMAP4"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "Indiquer le port NNTP"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Indiquer le nom de domaine"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "Répertoire IMAP4"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Seuls les sous-dossiers de ce dossier seront affichés."
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 msgid "Clear all message caches on exit"
 msgstr "Nettoyer les caches de message en quittant"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Placer les messages envoyés dans"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Placer les brouillons dans"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 msgid "Put queued messages in"
 msgstr "Placer les messages en attente d'envoi dans"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Placer les messages supprimés dans"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "Nom du compte non indiqué."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "Adresse électronique non saisie."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "Serveur SMTP non indiqué."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "Nom d'utilisateur manquant."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "Serveur POP3 non indiqué."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "Serveur IMAP4 non indiqué."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "Serveur NNTP non indiqué."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr "Le dossier indiqué n'est pas une file d'attente."
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6033,84 +6043,84 @@ msgstr ""
 "vous ne pourrez pas savoir s'il ira ou non au bon destinataire.\n"
 "Avez-vous néanmoins assez confiance en celle-ci pour l'utiliser ?"
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "L'en-tête du message en attente est corrompu.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Envoi du message avec la commande : %s\n"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Impossible d'exécuter la commande : %s"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Une erreur est survenue pendant l'exécution de la commande : %s"
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Connexion"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Connection au serveur SMTP : %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "Envoi de HELO..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "Authentification"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 msgid "Sending message..."
 msgstr "Envoi du message..."
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "Envoi de EHLO..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Envoi de MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Envoi"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Envoi de RCPT TO"
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Envoi de DATA"
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Fermeture..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Envoi du message (%d / %d octets)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Envoi de message"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "Une erreur est survenue pendant l'envoi de message."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/gl.po b/po/gl.po
index daaa1c53..e86eaa85 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -693,7 +693,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nome"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -1158,7 +1158,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Carpeta"
@@ -1191,7 +1191,7 @@ msgstr "Notificación"
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Erro"
 
@@ -1643,7 +1643,7 @@ msgstr ""
 "Non especificó ningunha conta para enviar.\n"
 "Seleccione algunha conta antes de enviar."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
@@ -1748,7 +1748,7 @@ msgstr "Tipo MIME"
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Enviar"
@@ -1790,7 +1790,7 @@ msgid "Attach file"
 msgstr "Adxuntar ficheiro"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Sinatura"
@@ -2004,7 +2004,7 @@ msgid " Check File "
 msgstr " Comprobar ficheiro "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Ficheiro"
 
@@ -2082,7 +2082,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2147,7 +2147,7 @@ msgstr "Tiempo límite (seg.)"
 msgid "Maximum Entries"
 msgstr "Nº entradas máximas"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Basico"
 
@@ -2205,7 +2205,7 @@ msgid "Exporting file:"
 msgstr "Ficheiro de exportación:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr "Seleccionar..."
 
@@ -2661,135 +2661,145 @@ msgstr "Finalizar"
 msgid "Sylpheed: %d new messages"
 msgstr "Finalizado (%d mensaxe(s) novo(s))"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Autenticando"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Obtendo novos mensaxes"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Feito (%d mensaxe(s) (%s) recibido(s))"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "feito (non hai mensaxes novos)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Conexión fallida"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Autorización fallida"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:596
+#: src/inc.c:635
 #, fuzzy
 msgid "Timeout"
 msgstr "Tiempo límite (seg.)"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finalizado (%d mensaxe(s) novo(s))"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Finalizado (non hai mensaxes novos)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "Ocurriu algún erro obtendo o correo."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obtendo novas mensaxes da conta %s...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Autenticando"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando novas mensaxes"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando ó servidor POP3: %s ..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Non se pode conectar ó servirdor POP3: %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtendo o número de novas mensaxes (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtendo o número de novas mensaxes (STAT)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtendo o número de novas mensaxes (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o tamaño de novas mensaxes (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "Borrando mensaxe %d"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Saíndo"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaxe (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Feito (%d mensaxe(s) (%s) recibido(s))"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 #, fuzzy
 msgid "Connection failed."
 msgstr "Conexión fallida"
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "Ocurriu un erro mentras se procesaba o correo."
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2798,28 +2808,28 @@ msgstr ""
 "Ocurriu un erro mentras se procesaba o correo:\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Non hai espacio libre no disco."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "Non se pode escribir o ficheiro."
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "Error de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "a caixa de correo esta bloqueada."
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2828,12 +2838,12 @@ msgstr ""
 "a caixa de correo esta bloqueada:\n"
 "%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Fallo de autenticación"
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2842,15 +2852,15 @@ msgstr ""
 "Fallo de autenticación:\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obtendo novos mensaxes dende %s en %s...\n"
@@ -3758,7 +3768,7 @@ msgstr "Incorporar correo novo de todas as contas"
 msgid "Send queued message(s)"
 msgstr "Enviar mensaxe(s) na cola"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Compoñer"
@@ -4099,224 +4109,224 @@ msgstr ""
 "¡Contrasinal erróneo! Intenteo de novo...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Abrindo Fiestra de preferencias de conta...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "conta%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Preferencias para unha nova conta"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Preferencias da conta"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Creando Fiestra de preferencias de conta...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Avanzadas"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Nome desta conta"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "conta por defecto"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Información persoal"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Nome completo"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "Enderezo de correo"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Organización"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Información do servidor"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "Novas (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Ningunha (local)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Este servidor require autenticación"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "Servidor de novas"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Servidor de recepción"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "Usuario"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Contrasinal"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Este servidor require autenticación"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Eliminar mensaxes do servidor ó recibir"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Eliminar despois de"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "días"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 días: eliminar inmediatamente)"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Descargar todas as mensaxes do servidor"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Tamaño límite para recibir"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensaxes ó recibir"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Caixa de correo por defecto"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(As mensaxes sen filtrar gardaránse nesta carpeta)"
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Método de autenticación"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Automática"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "Novas"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Número máximo de artigos a descargar\n"
 "(sen límite si se especifica 0)"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Traer todo' comproba si hai mensaxes novas nesta conta"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Cabeceira"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Engadir campo Data"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Xenerar ID-Mensaxe"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Engadir cabeceira de usuario"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " Editar... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticación SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4329,192 +4339,192 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Autenticación con POP3 antes de enviar"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 #, fuzzy
 msgid "Command output"
 msgstr "Saida do comando"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Establecer os seguintes enderezos automáticamente"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Respostar a"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Asinar a mensaxe por defecto"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Encriptar a mensaxe por defecto"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "Usar formato ASCII blindado para encriptación"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Usar sinatura de texto claro"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Asinar clave"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Usar clave GnuPG por defecto"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Seleccionar clave por dirección de correo"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Especificar clave manualmente"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "Usuario ou ID clave:"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "Non usar SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "Usar SSL para a conexión POP3"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usar o comando STARTTLS para abrir a sesión SSL"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usar SSL para a conexión IMAP4"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para a conexión NNTP"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "Usar SSL para a conexión SMTP"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "Porto SMTP"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "Porto POP3"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "Porto IMAP4"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "Porto NNTP"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Nome do dominio"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "Directorio do servidor IMAP4"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Descargar todas as mensaxes do servidor"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Poñer mensaxes enviadas en"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Poñer borradores de mensaxes en"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Poñer mensaxes borradas en"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Poñer mensaxes borradas en"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "Non se especificou o nome de conta."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "Non se especificou o enderezo de correo."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "Non se especificou o servidor SMTP."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "Non se especificou o usuario."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "Non se especificou o servidor POP3."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "Non se especificou o servidor IMAP4."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "Non se especificou o servidor NNTP."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6135,85 +6145,85 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "Cabeceira corrupta no mensaxe en cola.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Enviando mensaxe (%d / %d bytes)"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Non se pode executar o comando externo: %s\n"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Ocurriu un erro mentras se enviaba o correo."
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Conectando con o servidor SMTP: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 #, fuzzy
 msgid "Sending message..."
 msgstr "Enviando mensaxe"
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Enviando"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Enviando DATA..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Terminando..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando mensaxe (%d / %d bytes)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Enviando mensaxe"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "Ocurriu un erro enviando as mensaxes."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/hr.po b/po/hr.po
index 51db08a7..7ac9b991 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+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"
@@ -700,7 +700,7 @@ msgstr ""
 msgid "Name"
 msgstr "Ime"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -1155,7 +1155,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Spis"
@@ -1189,7 +1189,7 @@ msgstr "Obavijest"
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Greška"
 
@@ -1653,7 +1653,7 @@ msgstr ""
 "Račun za slanje pošte nije definiran.\n"
 "Molim, odaberite račun prije slanja."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
@@ -1756,7 +1756,7 @@ msgstr "MIME tip"
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Pošalji"
@@ -1798,7 +1798,7 @@ msgid "Attach file"
 msgstr "Priloži datoteku"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Potpis"
@@ -2015,7 +2015,7 @@ msgid " Check File "
 msgstr " Provjeri datoteku "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Datoteka"
 
@@ -2093,7 +2093,7 @@ msgid "Edit JPilot Entry"
 msgstr "Uredite JPilot unos"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2158,7 +2158,7 @@ msgstr "Timeout (sek)"
 msgid "Maximum Entries"
 msgstr "Max. Unos"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Osnovno"
 
@@ -2215,7 +2215,7 @@ msgid "Exporting file:"
 msgstr "Iznosim datoteku:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr " Odaberite... "
 
@@ -2691,197 +2691,207 @@ msgstr ""
 msgid "Sylpheed: %d new messages"
 msgstr "\t%d novih poruka\n"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Autorizacija"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Primam nove poruke"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "Standby"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Primam"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, fuzzy, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Ukloni poruke sa poslužitelja nakon primanja"
 
-#: src/inc.c:574
+#: src/inc.c:613
 #, fuzzy
 msgid "Done (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Veza nije uspjela"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Identifikacija nije uspjela"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:596
+#: src/inc.c:635
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, fuzzy, c-format
 msgid "Finished (%d new message(s))"
 msgstr "\t%d novih poruka\n"
 
-#: src/inc.c:649
+#: src/inc.c:688
 #, fuzzy
 msgid "Finished (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:658
+#: src/inc.c:697
 #, fuzzy
 msgid "Some errors occurred while getting mail."
 msgstr "Došlo je do grešaka prilikom primanja pošte."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "primam nove poruke s računa %s...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Autorizacija"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Primam nove poruke"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se na POP3 poslužitelj: %s ..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne mogu se povezati na POP3 poslužitelj: %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Primam broj novih poruka (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Primam broj novih poruka (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Primam broj novih poruka (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Primam veličinu poruka (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, fuzzy, c-format
 msgid "Deleting message %d"
 msgstr "Brišem poruke"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Izlazim"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ukloni poruke sa poslužitelja nakon primanja"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 #, fuzzy
 msgid "Connection failed."
 msgstr "Veza nije uspjela"
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Nema više mjesta na disku."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 #, fuzzy
 msgid "Can't write file."
 msgstr "Ne mogu pisati u datoteku.\n"
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 #, fuzzy
 msgid "Socket error."
 msgstr "protokol greška\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "Postavke sandučića"
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Postavke sandučića"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autorizacija"
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autorizacija"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 #, fuzzy
 msgid "Incorporation cancelled\n"
 msgstr "Prima novu poštu"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Primam nove poruke s %s u %s...\n"
@@ -3857,7 +3867,7 @@ msgstr "Prima novu poštu sa svih računa"
 msgid "Send queued message(s)"
 msgstr "Šalje odložene poruke"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Kreiraj"
@@ -4201,228 +4211,228 @@ msgstr ""
 "Pogrešna lozinka! Pokušajte ponovo...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Otvaram prozor za postavke računa...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Račun%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Postavke za novi račun"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Postavke računa"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Kreiram prozor za postvake računa...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Primanje"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Privatnost"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Ime ovog računa"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "Postavi kao uobičajeni"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Osobne informacije"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Puno ime"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "E-mail adresa"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Organizacija"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Informacije o poslužitelju"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Ništa (lokalno)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Ovaj server zahtijeva autorizaciju"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "News poslužitelj"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Poslužitelj za primanje"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "SMTP poslužitelj (slanje)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "ID korisnika"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Lozinka"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Ovaj server zahtijeva autorizaciju"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Ukloni poruke sa poslužitelja nakon primanja"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 #, fuzzy
 msgid "Remove after"
 msgstr "Ukloni spis"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 #, fuzzy
 msgid "days"
 msgstr "Uvijek"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 msgid "0 days: remove immediately"
 msgstr ""
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Primi sve poruke sa poslužitelja"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 #, fuzzy
 msgid "Receive size limit"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Filtriraj poruke pri primanju"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Uobičajeni sandučić"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nefiltrirane poruke biti će spremljene u ovaj spis)"
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 #, fuzzy
 msgid "Authentication method"
 msgstr "Autorizacija"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr ""
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maksimalni broj članaka za skidanje\n"
 "(0 je za neograničeno)"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Nije upisan primatelj."
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 #, fuzzy
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Primi sve' uzima poštu s ovog računa"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Zaglavlje"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Dodaj polje Datum u zaglavlje"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Generiraj ID poruke"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Dodatna zaglavlja"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " Uredi... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Autorizacija"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP autorizacija (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4432,198 +4442,198 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Autoriziraj s POP3 prije slanja"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 #, fuzzy
 msgid "Command output"
 msgstr "Naredba"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Automatski postavi slijedeće adrese"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Odvovori-Na"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Uvijek potpiši poruke"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Uvijek kriptiraj poruke"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 #, fuzzy
 msgid "Use clear text signature"
 msgstr "Unesi potpis"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Ključ potpisa"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Koristi uobičajeni GnuPG ključ"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Odaberi ključ po e-mail adresi"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Neki drugi ključ"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "ID ključa ili korisnika:"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "Ne koristi SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "Koristi SSL za POP3 veze"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Korsiti STARTTLS naredbu za pokretanje SSL-a"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "Koristi SSL za IMAP4 veze"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 #, fuzzy
 msgid "Use SSL for NNTP connection"
 msgstr "Koristi SSL za SMTP veze"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Slanje (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "Koristi SSL za SMTP veze"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "Specificirani SMTP port"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "Specificirani POP3 port"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "Specificirani IMAP4 port"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "Specificirani NNTP port"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Specificirano ime domene"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "Direktorij IMAP poslužitelja"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Primi sve poruke sa poslužitelja"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 #, fuzzy
 msgid "Put sent messages in"
 msgstr "Spremi poslane poruke u poslano"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 #, fuzzy
 msgid "Put draft messages in"
 msgstr "Sažmi poruke na"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Obriši poruku/e"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 #, fuzzy
 msgid "Put deleted messages in"
 msgstr "Obriši poruku/e"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 #, fuzzy
 msgid "Account name is not entered."
 msgstr "E-mail adresa nije upisana."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "E-mail adresa nije upisana."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "SMTP poslužitelj nije upisan."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "ID korisnika nije upisan."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "POP3 poslužitelj nije upisan."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 poslužitelj nije upisan."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "NNTP poslužitelj nije upisan."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6236,88 +6246,88 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "Zaglavlje odložene poruke je loše.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Šaljem poruku (%d / %d bytea)"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Ne mogu izvršiti vanjsku naredbu: %s\n"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Povezujem se"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Spajam se na SMTP poslužitelj: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 #, fuzzy
 msgid "Sending HELO..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 #, fuzzy
 msgid "Authenticating"
 msgstr "Autorizacija"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 #, fuzzy
 msgid "Sending message..."
 msgstr "Šaljem poruku"
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 #, fuzzy
 msgid "Sending EHLO..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Šaljem"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Šaljem RCPT TO..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Šaljem DATA..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Završavam..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Šaljem poruku (%d / %d bytea)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Šaljem poruku"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "Došlo je do greške prilikom slanja poruke."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/hu.po b/po/hu.po
index 6fa87d4a..54fe37ab 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-2.2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+0900\n"
 "PO-Revision-Date: 2006-07-15 17:27+0100\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: <NONE>\n"
@@ -695,7 +695,7 @@ msgstr ""
 msgid "Name"
 msgstr "Név"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -1154,7 +1154,7 @@ msgid "Group"
 msgstr "Csoport"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Mappa"
@@ -1187,7 +1187,7 @@ msgstr "Megjegyzés"
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Hiba"
 
@@ -1600,7 +1600,7 @@ msgstr ""
 "Nincs megadva hozzáférés a levél küldéshez.\n"
 "Válasszon ki egy hozzáférést küldés előtt!"
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hiba lépett fel a %s-nak/nek küldendő üzenet küldése közben."
@@ -1707,7 +1707,7 @@ msgstr "MIME típus"
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Küldés"
@@ -1749,7 +1749,7 @@ msgid "Attach file"
 msgstr "Fájl csatolása"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Aláírás"
@@ -1956,7 +1956,7 @@ msgid " Check File "
 msgstr " Fájl ellenőrzése"
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Fájl"
 
@@ -2034,7 +2034,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot bejegyzés szerkesztése"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2099,7 +2099,7 @@ msgstr "Időtúllépés (mp)"
 msgid "Maximum Entries"
 msgstr "Maximális bejegyzések"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Alap"
 
@@ -2156,7 +2156,7 @@ msgid "Exporting file:"
 msgstr "Exportálás fájlba:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr " Kiválaszt... "
 
@@ -2606,133 +2606,143 @@ msgstr "Vége"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d új üzenet"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Azonosítás"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Új üzenetek fogadása"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "Készenlét"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Megszakítva"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Fogadás"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Kész (%d üzenet (%s) fogadott)"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "Kész (nincs új üzenet)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Kapcsolat megszakadt"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Azonosítás nem sikerült"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Zárolt"
 
-#: src/inc.c:596
+#: src/inc.c:635
 msgid "Timeout"
 msgstr "Időtúllépés"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Vége (%d új üzenet)"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Vége (nincs új üzenet)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "Hiba történt a levelek fogadásakor."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s hozzáférésről az új üzenetek letöltése...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Azonosítás"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Új üzenetek fogadása"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Kapcsolódás a(z) %s POP3 szerverhez ..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nem sikerült kapcsolódni a POP3 szerverhez: %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Azonosítás..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s üzeneteinek fogadása..."
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Új üzenetek számának megszerzése (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Új üzenetek számának megszerzése (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Új üzenetek számának megszerzése (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Új üzenetek méretének megszerzése (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d üzenet törlése"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Kilépés"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Üzenet vétele (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Üzenetek fogadása (%d üzenet (%s) fogadott)"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 msgid "Connection failed."
 msgstr "Kapcsolat megszakadt."
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "Hiba a levelek feldolgozása közben."
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2741,28 +2751,28 @@ msgstr ""
 "Hiba a levelek feldolgozása közben:\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Nincs több szabad hely a lemezen."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "Nem lehet a fájlba írni."
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "Socket hiba."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr "A távoli fél bezárta a kapcsolatot."
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "A postafiók zárolt."
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2771,11 +2781,11 @@ msgstr ""
 "A postafiók zárolt:\n"
 "%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 msgid "Authentication failed."
 msgstr "Az azonosítás nem sikerült."
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2784,15 +2794,15 @@ msgstr ""
 "Az azonosítás nem sikerült:\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr "Menet időtúllépése."
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "Fogadás megszakítva\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s új üzeneteinek megszerzése %s mappába...\n"
@@ -3666,7 +3676,7 @@ msgstr "Új levelek fogadása minden hozzáférésen"
 msgid "Send queued message(s)"
 msgstr "Várakozó sorból üzenet(ek) küldése"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Új levél"
@@ -4028,217 +4038,217 @@ msgstr ""
 "Hibás jelmondat! Próbálja újra...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Hozzáférés beállítások ablak megnyitása...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Hozzáférés%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Új hozzáférés beállításai"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Hozzáférés beállítások"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Hozzáférésbeállítások ablak létrehozása...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Fogadás"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Magánszféra"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Haladó"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Hozzáférés neve"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "Alapértelmzésként beállítás"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Személyes információ"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Teljes név"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "Email cím"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Szervezet"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Szerver információ"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "Hírek (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Semmi (helyi)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Ezen a szerveren kötelező az azonosítás"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "Hírszerver"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Szerver a fogadáshoz"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "SMTP szerver (küldés)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "Felhasználói Azonosító"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Jelszó"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 msgid "Use secure authentication (APOP)"
 msgstr "Biztonságos hitelesítés használata (APOP)"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Üzenetek törlése a szerverről fogadás után"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Eltávolítás utána"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "nap"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 msgid "0 days: remove immediately"
 msgstr "0 nap: azonnal eltávolítani"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Minden üzenet letöltése a szerverről"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Fogadott levél méretkorlát"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Üzenetek szűrése fogadás közben"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Alapértelmezett bejövő postafiók"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "A nem szűrt üzenetek ebbe a mappába fognak kerülni."
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Azonosítási módszer"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 msgid "Only check INBOX on receiving"
 msgstr "Csak az INBOX ellenőrzése fogadáskor"
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "Hírek"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 msgid "Maximum number of articles to download"
 msgstr "A letölteni kívánt maximális cikkek száma"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 msgid "No limit if 0 is specified."
 msgstr "Ha 0 van megadva, akkor korlátlan."
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Fogadás mindről' ellenőrizze ezt a hozzáférést is"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Fejléc"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Dátum fejléc mező hozzáadás"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Üzenet-azonosító generálása"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Felhasználó által definiált fejléc hozzáadása"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " Szerkesztés... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Azonosítás"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Azonosítás (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4250,189 +4260,189 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Azonosítás küldés előtt POP3-mal"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 msgid "Command output"
 msgstr "Parancskimenet"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Az alábbi címek automatikus beállítása"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Másolat"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Titkos másolat"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Válaszcím"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Üzenetet mindig írja alá digitálisan"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Üzenetet mindig titkosítsa"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr "Titkosítás, ha titkosított üzenetre válaszol"
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "ASCII-páncélozott formátum használata titkosításhoz"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Szöveges aláírás használata"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Digitális aláírás kulcs"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Alapértelmezett GnuPG kulcs használata"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Kulcs választása az email címe alapján"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Kulcs kézi megadása"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "Felhasználó vagy kulcs Azonosító:"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "Nem használ SSL-t"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "SSL használata POP3 kapcsolathoz"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "STARTTLS parancs használata SSL kapcsolat indításához"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL használata IMAP4 kapcsolathoz"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "SSL használata NNTP kapcsolathoz"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Küldés (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "SSL használata SMTP kapcsolathoz"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr "Nem-blokkolódó SSL használata"
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Ezt kapcsolja ki, ha az SSL kapcsolattal probléma van."
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "SMTP port megadása"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "POP3 port megadása"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "IMAP4 port megadása"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "NNTP port megadása"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Tartománynév (domain) megadása"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "IMAP szerver könyvtár"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Csak ezen könyvtár almappái fognak megjelenni."
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 msgid "Clear all message caches on exit"
 msgstr "Kilépéskor töröl minden gyorstárazott üzenetet"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Elküldött üzenetek elhelyezése"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Vázlatok elhelyezése"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 msgid "Put queued messages in"
 msgstr "Várakozó üzenetek elhelyezése itt"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Törölt üzenetek elhelyezése"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "Hozzáférés név nincs megadva."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "Nincs email cím megadva."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "Nincs megadott SMTP szerver."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "Nincs felhasználói azonosító megadva."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "Nincs megadott POP3 szerver."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "Nincs megadott IMAP4 szerver."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "Nincs megadott NNTP szerver."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr "A megadott mappa nem egy várakozó mappa."
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5998,84 +6008,84 @@ msgstr ""
 "tudhatja biztosan, hogy ahhoz a személyhez jut el, akinek szánta.\n"
 "Megbízik ennek ellenére annyira ebben a kulcsban, hogy használja?"
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "A várakozó üzenet fejléce sérült.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Üzenet küldésre használt parancs: %s\n"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "A parancs nem futtatható: %s"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Hiba történt a parancs futtatása közben: %s"
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Kapcsolódás"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Kapcsolódás %s SMTP szerverhez..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "HELO küldése..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "Azonosítás"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 msgid "Sending message..."
 msgstr "Üzenet küldése ..."
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "EHLO küldése..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM küldése..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Küldés"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO küldése..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "DATA küldése..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Kilépés..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Üzenet küldése (%d / %d bájt)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Üzenet küldése"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "Hiba történt üzenetküldés közben."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/it.po b/po/it.po
index b37e45ea..32989c63 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.2.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+0900\n"
 "PO-Revision-Date: 2006-10-14 11:32+0200\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it,dbodei@katamail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -694,7 +694,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nome"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Protocollo"
 
@@ -1157,7 +1157,7 @@ msgid "Group"
 msgstr "Gruppo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Cartella"
@@ -1190,7 +1190,7 @@ msgstr "Avviso"
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Errore"
 
@@ -1602,7 +1602,7 @@ msgstr ""
 "Non è specificato l'account per l'invio della posta.\n"
 "Scegliere un account di posta prima dell'invio."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Si è verificato un errore durante l'invio del messaggio a %s ."
@@ -1717,7 +1717,7 @@ msgstr "Tipo MIME"
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Invia"
@@ -1759,7 +1759,7 @@ msgid "Attach file"
 msgstr "Allega il file"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Firma"
@@ -1966,7 +1966,7 @@ msgid " Check File "
 msgstr " Controllo file "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "File"
 
@@ -2045,7 +2045,7 @@ msgid "Edit JPilot Entry"
 msgstr "Modifica la voce JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2110,7 +2110,7 @@ msgstr "Timeout (secondi)"
 msgid "Maximum Entries"
 msgstr "Numero massimo di voci"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Essenziale"
 
@@ -2168,7 +2168,7 @@ msgid "Exporting file:"
 msgstr "File su cui esportare:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr " Seleziona... "
 
@@ -2618,133 +2618,143 @@ msgstr "Fine"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nuovi messaggi"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Autenticazione"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Recupero i nuovi messaggi"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "Attesa"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Cancellato"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Recupero"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Fatto (ricevuti %d messaggio(i) (%s))"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "Fatto (non ci sono nuovi messaggi)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Connessione fallita"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Autenticazione fallita"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Bloccato"
 
-#: src/inc.c:596
+#: src/inc.c:635
 msgid "Timeout"
 msgstr "Timeout"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finito (%d nuovo(i) messaggio(i))"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Finito (non ci sono nuovi messaggi)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "Ci sono stati degli errori durante la ricezione della posta."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "ricezione dei nuovi messaggi dell'account %s...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Autenticazione"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recupero i nuovi messaggi"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Connessione al server POP3: %s..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossibile connettersi al server POP3: %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Autenticazione..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Ricezione dei messaggi da %s..."
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Ricezione del numero dei nuovi messaggi (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Ricezione del numero dei nuovi messaggi (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Ricezione del numero dei nuovi messaggi (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Ricezione della dimensione dei messaggi (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "Eliminazione del messaggio %d"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Esco"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recupero il messaggio (%d di %d) (%s di %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ricezione di (%d messaggio(i) ricevuti (%s))"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 msgid "Connection failed."
 msgstr "Connessione fallita."
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "Si è verificato un errore durante l'elaborazione della posta."
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2753,28 +2763,28 @@ msgstr ""
 "Si è verificato un errore durante l'elaborazione della posta:\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Spazio su disco esaurito."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "Impossibile scrivere il file."
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "Errore del socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr "Connessione chiusa dall'host remoto."
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "La casella postale è bloccata."
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2783,11 +2793,11 @@ msgstr ""
 "La casella postale è bloccata:\n"
 "%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 msgid "Authentication failed."
 msgstr "Autenticazione fallita."
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2796,15 +2806,15 @@ msgstr ""
 "Autenticazione fallita:\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr "La sessione è andata in timeout."
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "Incorporazione cancellata\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Ricezione in %s dei nuovi messaggi da %s...\n"
@@ -3678,7 +3688,7 @@ msgstr "Include la nuova posta di tutti gli account"
 msgid "Send queued message(s)"
 msgstr "Invia i messaggi accodati"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Componi"
@@ -4038,218 +4048,218 @@ msgstr ""
 "Passphrase sbagliata! Provare ancora...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Apertura della finestra delle preferenze degli account...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Preferenze per il nuovo account"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Preferenze dell'account"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Creazione della finestra delle preferenze degli account...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Ricevi"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Avanzato"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Nome di questo account"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "Imposta come predefinito"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Informazioni personali"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Nome completo"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "Indirizzo di posta"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Informazioni sui server"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
 # src/prefs_account.c:634 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Nessuno (locale)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Questo server richiede l'autenticazione"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "Server delle news"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Server per la ricezione"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "Server SMTP (spedisce)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "User ID"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Password"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 msgid "Use secure authentication (APOP)"
 msgstr "Usa l'autenticazione sicura (APOP)"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Rimuovi i messaggi sul server dopo averli ricevuti"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Rimuovi dopo "
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr " giorni"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 msgid "0 days: remove immediately"
 msgstr "0 giorni: rimuovi immediatamente"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Scarica tutti i messaggi sul server"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Limite della dimensione da ricevere di"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Filtra i messaggi in ricezione"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Inbox predefinita"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "I messaggi non filtrati saranno memorizzati in questa cartella."
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Metodo di autenticazione"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Automatico"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 msgid "Only check INBOX on receiving"
 msgstr "Controlla solo «In entrata» in ricezione"
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 msgid "Maximum number of articles to download"
 msgstr "Numero massimo di articoli da scaricare"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 msgid "No limit if 0 is specified."
 msgstr "Nessun limite se viene specificato 0."
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "«Ricevi tutti» controlla i nuovi messaggi su questo account"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Intestazione"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Aggiungi il campo Data nell'intestazione"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Genera ID messaggio"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Aggiungi un'intestazione definita dall'utente"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " Modifica... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticazione SMTP (SMTP AUT)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4261,189 +4271,189 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentica con POP3 prima dell'invio"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 msgid "Command output"
 msgstr "Output del comando"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Imposta automaticamente i seguenti indirizzi"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Rispondi a"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Firma il messaggio per predefinizione"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Cifra il messaggio per predefinizione"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr "Cifra quando rispondi a un messaggio cifrato"
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "Usa il formato ASCII-armato per la cifratura"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Usa la firma con il testo in chiaro"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Chiave della firma"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Usa la chiave predefinita di GnuPG"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Scegli la chiave per il tuo indirizzo email"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Specifica la chiave manualmente"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "ID user o chiave:"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "Non usare SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "Usa SSL per la connessione POP3"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usa il comando STARTTLS per iniziare la sessione SSL"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usa SSL per la connessione IMAP4"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "Usa SSL per la connessione NNTP"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Invio (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "Usa SSL per la connessione SMTP"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr "Usa SSL non bloccato"
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Disattivare se si hanno problemi nella connessione SSL."
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "Specifica la porta SMTP"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "Specifica la porta POP3"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "Specifica la porta IMAP4"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "Specifica la porta NNTP"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Specifica il nome di dominio"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "Directory del server IMAP4"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Verranno visualizzate solo le sottocartelle di questa directory."
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 msgid "Clear all message caches on exit"
 msgstr "Pulisci tutte le cache dei messaggi all'uscita"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Metti i messaggi spediti in"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Metti i messaggi abbozzati in"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 msgid "Put queued messages in"
 msgstr "Metti i messaggi accodati in"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Metti i messaggi eliminati in"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "Non è stato immesso il nome dell'account."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "Non è stato immesso l'indirizzo di posta."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "Non è stato immesso il server SMTP."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "Non è stato immesso lo user ID."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "Non è stato immesso il server POP3."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "Non è stato immesso il server IMAP4."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "Non è stato immesso il server NNTP."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr "La cartella specificate non è una cartella «Coda»."
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6011,84 +6021,84 @@ msgstr ""
 "saprete con sicurezza se andrà alla persona che intendete voi.\n"
 "Ritenerla sufficientemente fidata da usarla comunque?"
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "L'intestazione del messaggio accodato è rovinata.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Invio del messaggio usando il comando: %s\n"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Impossibile eseguire il comando: %s"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Si è verificato un errore durante l'esecuzione del comando: %s"
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Connessione"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Connessione al server SMTP: %s..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "Invio di HELO..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "Autenticazione"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 msgid "Sending message..."
 msgstr "Invio del messaggio..."
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "Invio di EHLO..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Invio di MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Invio"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Invio di RCPT TO..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Invio di DATA..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Esco..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Invio del messaggio (%d di %d byte)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Invio del messaggio"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "Si è verificato un errore durante l'invio del messaggio."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/ja.po b/po/ja.po
index 0c30ee9a..646a735c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+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"
@@ -691,7 +691,7 @@ msgstr ""
 msgid "Name"
 msgstr "名前"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "プロトコル"
 
@@ -1151,7 +1151,7 @@ msgid "Group"
 msgstr "グループ"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "フォルダ"
@@ -1184,7 +1184,7 @@ msgstr "注意"
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "エラー"
 
@@ -1596,7 +1596,7 @@ msgstr ""
 "メールを送信するためのアカウントが指定されていません。\n"
 "送信する前にメールアカウントを選択してください。"
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "メッセージを %s にポストする途中にエラーが発生しました。"
@@ -1707,7 +1707,7 @@ msgstr "MIME タイプ"
 msgid "Size"
 msgstr "サイズ"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "送信"
@@ -1749,7 +1749,7 @@ msgid "Attach file"
 msgstr "ファイルを添付"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "署名"
@@ -1956,7 +1956,7 @@ msgid " Check File "
 msgstr " ファイルをチェック "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "ファイル"
 
@@ -2034,7 +2034,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilotエントリを編集"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2099,7 +2099,7 @@ msgstr "タイムアウト(秒)"
 msgid "Maximum Entries"
 msgstr "最大エントリ数"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "基本"
 
@@ -2156,7 +2156,7 @@ msgid "Exporting file:"
 msgstr "エクスポートファイル:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr " 選択... "
 
@@ -2605,133 +2605,142 @@ msgstr "完了"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d 通の新着メッセージ"
 
-#: src/inc.c:373
+#: src/inc.c:386
+msgid "Authenticating with POP3"
+msgstr "POP3で認証中"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "新着メッセージを受信中"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "待機中"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "キャンセル"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "受信中"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "完了 (%d 通 (%s) 受信)"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "完了 (新着メッセージなし)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "接続失敗"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "認証失敗"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "ロック中"
 
-#: src/inc.c:596
+#: src/inc.c:635
 msgid "Timeout"
 msgstr "タイムアウト"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完了 (%d 通の新着メッセージ)"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "完了 (新着メッセージなし)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "メールの取得中にエラーが発生しました。"
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "アカウント %s の新着メッセージを取り込んでいます...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "%s: POP3で認証中"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 新着メッセージを受信中"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3サーバ: %s に接続中..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3サーバ: %s:%d に接続できません\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "認証中..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s からメッセージを受信中..."
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "新着メッセージの数を取得中 (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "新着メッセージの数を取得中 (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "新着メッセージの数を取得中 (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "メッセージのサイズを取得中 (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "メッセージ %d を削除中"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "切断中"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "メッセージを受信中 (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "受信中 (%d 通 (%s) 受信)"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 msgid "Connection failed."
 msgstr "接続に失敗しました。"
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "メールの処理中にエラーが発生しました。"
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2740,28 +2749,28 @@ msgstr ""
 "メールの処理中にエラーが発生しました:\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "ディスクの空き容量がありません。"
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "ファイルに書き込めません。"
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "ソケットエラーです。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr "リモートホストによって接続を切断されました。"
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "メールボックスはロックされています。"
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2770,11 +2779,11 @@ msgstr ""
 "メールボックスはロックされています:\n"
 "%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 msgid "Authentication failed."
 msgstr "認証に失敗しました。"
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2783,15 +2792,15 @@ msgstr ""
 "認証に失敗しました:\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr "セッションがタイムアウトしました。"
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "受信をキャンセルしました\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "新しいメッセージを %s から %s に取り込んでいます...\n"
@@ -3662,7 +3671,7 @@ msgstr "全アカウントの新着メールの取込"
 msgid "Send queued message(s)"
 msgstr "送信待機中のメッセージを送信する"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "作成"
@@ -4022,217 +4031,217 @@ msgstr ""
 "不正なパスフレーズです! 再入力して下さい...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "アカウントプリファレンスウィンドウを開いています...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "新規アカウントの設定"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "アカウントの設定"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "アカウントプリファレンスウィンドウを作成中...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "受信"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "個人情報"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "高度な設定"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "このアカウントの名称"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "通常使用"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "個人情報"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "名前"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "メールアドレス"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "組織"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "サーバ情報"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "ニュース (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "なし (ローカル)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "このサーバは認証が必要"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "ニュースサーバ"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "受信用サーバ"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "SMTPサーバ (送信)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "ユーザID"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "パスワード"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 msgid "Use secure authentication (APOP)"
 msgstr "安全な認証方式を使用する (APOP)"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "受信時にサーバ上のメッセージを削除する"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "メッセージを"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "日後に削除"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 msgid "0 days: remove immediately"
 msgstr "0日: 即座に削除"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "サーバ上のすべてのメッセージを受信する"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "受信サイズ制限"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "受信時にメッセージを振り分ける"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "標準の受信箱"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "振り分けられなかったメッセージはこのフォルダに格納されます。"
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "認証方式"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "自動"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 msgid "Only check INBOX on receiving"
 msgstr "受信時に受信箱(INBOX)のみチェックする"
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "ニュース"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 msgid "Maximum number of articles to download"
 msgstr "ダウンロードする記事数の上限"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 msgid "No limit if 0 is specified."
 msgstr "0を指定すると無制限になります。"
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "「全受信」でこのアカウントの新着メッセージをチェックする"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "ヘッダ"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Dateヘッダフィールドを付ける"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "メッセージIDを生成する"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "ユーザ定義のヘッダを追加する"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " 編集... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "認証"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP認証 (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4243,189 +4252,189 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "送信前にPOP3認証を行う"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 msgid "Command output"
 msgstr "コマンドの出力"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "以下のアドレスを自動指定"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "標準でメッセージに署名する"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "標準でメッセージを暗号化する"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr "暗号化されたメッセージに返信した場合は暗号化する"
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "暗号化にASCII包装形式を使用する"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "クリアテキスト署名を使用する"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "署名鍵"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "標準のGnuPG鍵を使用する"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "自分の電子メールアドレスで鍵を選択する"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "鍵を手動で指定する"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "ユーザまたは鍵ID:"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "SSLを使用しない"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "POP3の接続にSSLを使用"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "SSLセッションの開始にSTARTTLSコマンドを使用"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "IMAP4の接続にSSLを使用"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "NNTPの接続にSSLを使用"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "送信 (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "SMTPの接続にSSLを使用"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr "非ブロッキングSSLを使用する"
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "SSLの接続に問題が生じる場合はオフにしてください。"
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "SMTPポートを指定"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "POP3ポートを指定"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "IMAP4ポートを指定"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "NNTPポートを指定"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "ドメイン名を指定"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "IMAPサーバディレクトリ"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "このディレクトリのサブフォルダのみが表示されます。"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 msgid "Clear all message caches on exit"
 msgstr "終了時にすべてのメッセージのキャッシュをクリアする"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "送信控フォルダの場所"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "草稿フォルダの場所"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 msgid "Put queued messages in"
 msgstr "送信待ちフォルダの場所"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "ごみ箱フォルダの場所"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "アカウント名が入力されていません。"
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "メールアドレスが入力されていません。"
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "SMTPサーバが入力されていません。"
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "ユーザIDが入力されていません。"
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "POP3サーバが入力されていません。"
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4サーバが入力されていません。"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "NNTPサーバが入力されていません。"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr "指定したフォルダは送信待ちフォルダではありません。"
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5982,84 +5991,84 @@ msgstr ""
 "それが目的の相手に届くかどうかは保証できません。\n"
 "とにかくこの鍵を信用して使用しますか?"
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "送信待機中のメッセージのヘッダが壊れています。\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "コマンドを使用してメッセージを送信中: %s\n"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "コマンドを実行できません: %s"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "コマンドの実行中にエラーが発生しました: %s"
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "接続中"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "SMTPサーバ: %s に接続中..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "HELO を送信中..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "認証中"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 msgid "Sending message..."
 msgstr "メッセージを送信中..."
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "EHLO を送信中..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM を送信中..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "送信中"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO を送信中..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "DATA を送信中..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "切断中..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "メッセージを送信中 (%d / %d bytes)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "メッセージを送信中"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "メッセージの送信中にエラーが発生しました。"
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/ko.po b/po/ko.po
index 6d32da10..dbeb6a73 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed  0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+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"
@@ -684,7 +684,7 @@ msgstr ""
 msgid "Name"
 msgstr "이름"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "프로토콜"
 
@@ -1142,7 +1142,7 @@ msgid "Group"
 msgstr "그룹"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "폴더"
@@ -1175,7 +1175,7 @@ msgstr "알림"
 msgid "Warning"
 msgstr "경고"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "에러"
 
@@ -1627,7 +1627,7 @@ msgstr ""
 "메일을 보내기위한 계정이 지정되어있지않습니다.\n"
 "보내기 전에 메일 계정을 선택하세요."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
@@ -1731,7 +1731,7 @@ msgstr "마임 타입"
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "메일 발송"
@@ -1773,7 +1773,7 @@ msgid "Attach file"
 msgstr "파일 첨부"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "서명"
@@ -1988,7 +1988,7 @@ msgid " Check File "
 msgstr " 파일 확인 "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "파일"
 
@@ -2066,7 +2066,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot 항목 편집"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2131,7 +2131,7 @@ msgstr ""
 msgid "Maximum Entries"
 msgstr ""
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "기본"
 
@@ -2188,7 +2188,7 @@ msgid "Exporting file:"
 msgstr ""
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr "고르기..."
 
@@ -2644,189 +2644,199 @@ msgstr ""
 msgid "Sylpheed: %d new messages"
 msgstr "끝났습니다 (%d개의 새로운 메시지)"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "인증"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "새 메시지를 가져옴"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr ""
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "취소되었습니다"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr ""
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "완료 (%d 메시지 (%s)가 받아짐)"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "완료 (새 메시지 없음)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "연결이 실패했습니다"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "인증이 실패했습니다."
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:596
+#: src/inc.c:635
 msgid "Timeout"
 msgstr ""
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "끝났습니다 (%d개의 새로운 메시지)"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "끝났습니다 (새 메시지 없음)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "편지를 받다가 에러가 발생했습니다."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s 계정으로부터 새 메시지를 얻습니다...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "인증"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 새 메시지를 가져옴"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3 서버 %s에 연결합니다..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "%s:%d POP3 서버에 연결할 수가 없습니다\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "인증 중입니다..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "새 메시지의 갯수를 얻는 중 (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "새 메시지의 갯수를 얻는 중 (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "새 메시지의 갯수를 얻는 중 (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "메시지의 크기를 얻는 중 (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d 메시지를 삭제하는 중"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "끝마치는 중"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "메시지 (%d / %d) 를 가져오는 중 (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "완료 (%d 메시지 (%s)가 받아짐)"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 #, fuzzy
 msgid "Connection failed."
 msgstr "연결이 실패했습니다"
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "디스크에 남은 공간이 없슴."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "파일에 쓸 수가 없습니다."
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "소켓 에러."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "메일박스가 잠겨있습니다."
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "메일박스가 잠겨있습니다."
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 #, fuzzy
 msgid "Authentication failed."
 msgstr "인증 방법"
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "인증 방법"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "병합이 취소되었습니다.\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s로부터 %s로 새 메시지를 가져옴...\n"
@@ -3731,7 +3741,7 @@ msgstr "모든 계정에서 새 메일을 가져옵니다"
 msgid "Send queued message(s)"
 msgstr "임시 보관된 메시지를 보냅니다"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "작성"
@@ -4071,226 +4081,226 @@ msgstr ""
 "Bad passphrase! 다시 시도하세요...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "계정 설정 창을 엽니다...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "계정%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "새 계정에대한 설정"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "계정 기본 설정"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "계정 설정 창을 생성합니다...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "받기"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "프라이버시"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "고급"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "이 계정의 이름"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "기본 계정으로 설정"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "신상 정보"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "정식 이름"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "메일 주소"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "기관"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "서버 정보"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "뉴스(NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "로컬"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "이 서버는 인증을 필요로 합니다"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "뉴스 서버"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "받는 서버"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "SMTP 서버(발송용)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "사용자 계정"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "암호"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "이 서버는 인증을 필요로 합니다"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "받은 후 서버에서 메시지를 지움"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 #, fuzzy
 msgid "Remove after"
 msgstr "폴더 이름 변경"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 #, fuzzy
 msgid "days"
 msgstr "항상"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 일: 즉시 삭제)"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "서버에서 모든 메시지를 받음"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "받을 크기 한도"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "받을때 메시지를 필터링"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "기본 우편함"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(필터링 되지 않은 메시지는 이 폴더에 저장될 것입니다)"
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "인증 방법"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "자동"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "뉴스"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "내려받을 최대 기사 수\n"
 "(0인 경우 제한 없음)"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "받는 사람이 지정되지않았습니다"
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "헤더"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Date 헤더 항목을 추가"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Message-ID 생성"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "사용자 정의된 헤더 추가"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " 편집..."
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "인증"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP 인증(SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4300,192 +4310,192 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "보내기전 POP3와 인증"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 #, fuzzy
 msgid "Command output"
 msgstr "명령어"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "다음 주소를 자동적으로 정함"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "참조"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "숨은 참조"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "회신주소"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "기본으로 메시지에 사인을 함"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "기본으로 메시지를 암호화"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "순수한 텍스트 서명 사용"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "기본 GnuPG 키 사용"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "당신의 전자우편 주소로 키 선택"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "수동으로 키 지정"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "사용자 혹은 키 ID:"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "SSL을 사용하지 않습니다"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "POP3 연결에 SSL을 사용합니다"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "SSL 세션을 시작하기 위해 STARTTLS 명령을 사용합니다"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "IMAP4 연결에 SSL을 사용합니다"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "NNTP 연결에 SSL을 사용합니다"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "SMTP 연결에 SSL을 사용합니다"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "SMTP 포트 번호"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "POP3 포트 번호"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "IMAP4 포트 지정"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "NNTP 포트 지정"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "도메인 이름 지정"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "IMAP 서버 디렉토리"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "서버에서 모든 메시지를 받음"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "보낸 메시지 저장"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "임시 메시지 저장"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "삭제된 메시지 저장"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "삭제된 메시지 저장"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "계정 이름이 입력되지 않았습니다."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "메일 주소가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "SMTP 서버가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "사용자 아이디가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "POP3 서버가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 서버가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "NNTP 서버가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6083,85 +6093,85 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "보낼 메시지의 헤더가 깨졌습니다.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "메시지를 보내는 중 (%d / %d 바이트)"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "외부 명령을 실행할 수가 없습니다: %s\n"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "연결 중입니다"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "SMTP 서버에 연결하고 있습니다: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "HELO를 보냅니다..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "인증"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 #, fuzzy
 msgid "Sending message..."
 msgstr "메시지을 보내는 중"
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "EHLO를 보냅니다..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM을 보냅니다..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "보냅니다"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO를 보냅니다..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "DATA를 보냅니다..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "끝마치는 중..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "메시지를 보내는 중 (%d / %d 바이트)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "메시지을 보내는 중"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "메시지를 보내는데 에러 발생"
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/lt.po b/po/lt.po
index 29a0b681..c6b9bb64 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+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"
@@ -691,7 +691,7 @@ msgstr ""
 msgid "Name"
 msgstr "Vardas"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Protokolas"
 
@@ -1149,7 +1149,7 @@ msgid "Group"
 msgstr "Grupė"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Katalogas"
@@ -1182,7 +1182,7 @@ msgstr "Pranešimas"
 msgid "Warning"
 msgstr "Įspėjimas"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Klaida"
 
@@ -1595,7 +1595,7 @@ msgstr ""
 "Nenurodyta sąskaita pašto siuntimui.\n"
 "Prieš siųsdami pažymėkitę norimą sąskaitą."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Klaida siunčiant laišką %s ."
@@ -1701,7 +1701,7 @@ msgstr "MIME tipas"
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Siųsti"
@@ -1743,7 +1743,7 @@ msgid "Attach file"
 msgstr "Prisegti failą"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Parašas"
@@ -1950,7 +1950,7 @@ msgid " Check File "
 msgstr " Patikrinti failą "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Failas"
 
@@ -2028,7 +2028,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redaguoti JPilot įrašą"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2093,7 +2093,7 @@ msgstr "Skirtasis laikas (sek.)"
 msgid "Maximum Entries"
 msgstr "Įrašų maksimumas"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Pagrindinis"
 
@@ -2150,7 +2150,7 @@ msgid "Exporting file:"
 msgstr "Eksportuojamas failas:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr " Pasirinkti... "
 
@@ -2599,133 +2599,143 @@ msgstr "Baigti"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nauji laiškai"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Tikrinamas autentiškumas"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Gaunami nauji laiškai"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "Laukiama"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Nutraukta"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Gaunama"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Atlikta (gauta laiškų: %d (%s))"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "Atlikta (naujų laiškų negauta)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Nepavyko prisijungti"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Nepavyko patvirtinti autentiškumo"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Užrakinta"
 
-#: src/inc.c:596
+#: src/inc.c:635
 msgid "Timeout"
 msgstr "Baigėsi skirtasis laikas"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Baigta (Nauji laiškai: %d)"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Baigta (Nėra naujų laiškų: %d)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "Klaidos gaunant paštą."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "gaunami „%s“ sąskaitos laiškai...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Tikrinamas autentiškumas"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: gaunami nauji laiškai"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Jungiuosi prie POP3 serverio: %s..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Negaliu prisijungti prie POP3 serverio: %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Patvirtinamas autentiškumas..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Gaunami laiškai iš %s..."
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Gaunamas naujų laiškų skaičius (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Gaunamas naujų laiškų skaičius (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Gaunamas naujų laiškų skaičius (UILD)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Gaunamas naujų laiškų dydis (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "Trinamas laiškas %d"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Išeinu"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Gaunamas laiškas (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Gaunama (Gauti laiškai: %d (%s))"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 msgid "Connection failed."
 msgstr "Nepavyko prisijungti."
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "Klaida tvarkant paštą."
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2734,28 +2744,28 @@ msgstr ""
 "Klaida tvarkant paštą:\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Nėra vietos diske."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "Negaliu įrašyti į failą."
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "Socket error."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr "Prisijungimas uždarytas nuotolinio serverio."
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "Dėžutė užrakinta."
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2764,11 +2774,11 @@ msgstr ""
 "Dėžutė užrakinta:\n"
 "%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 msgid "Authentication failed."
 msgstr "Nepavyko patvirtinti autentiškumo."
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2777,15 +2787,15 @@ msgstr ""
 "Nepavyko patvirtinti autentiškumo:\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr "Baigėsi sesijos laikas."
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "Prijungimas nutrauktas\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Gaunami nauji laiškai iš %s į %s...\n"
@@ -3658,7 +3668,7 @@ msgstr "Prijungti naują visų sąskaitų paštą"
 msgid "Send queued message(s)"
 msgstr "Siųsti laiškus eilėje"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Rašyti"
@@ -4017,217 +4027,217 @@ msgstr ""
 "Bloga slapta frazė! Bandykite dar kartą...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Atveriamas sąskaitos nustatymų langas...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Sąskaita%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Naujos sąskaitos nustatymai"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Sąskaitos nustatymai"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Sukuriamas sąskaitos nustatymų langas...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Gauti"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Privatumas"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Papildomi"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Sąskaitos vardas"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "Pažymėti kaip įprastą"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Asmeninė informacija"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Pilnas vardas"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "El. pašto adresas"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Organizacija"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Severio informacija"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "Naujienos (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Vietinis"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Serveris reikalauja patvirtinti autentiškumą"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "Naujienų serveris"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Serveris pašto gavimui"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "SMTP serveris (siuntimui)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "Vartotojo ID"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 msgid "Use secure authentication (APOP)"
 msgstr "Naudoti saugų autentiškumo tikrinimą (APOP)"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Po gavimo pašalinti laiškus iš serverio"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Pašalinti po"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "dienų"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 msgid "0 days: remove immediately"
 msgstr "0 dienų: pašalinti iš karto"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Atsisiųsti visus laiškus serveryje"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Dydžio limitas"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Filtruoti laiškus gaunant"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Gaunamų laiškų dėžutė"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Nefiltruoti laiškai bus laikomos šiame kataloge."
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Autentiškumo patikrinimo metodas"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Automatinis"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 msgid "Only check INBOX on receiving"
 msgstr "Tikrinti tik INBOX"
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "Naujienos"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 msgid "Maximum number of articles to download"
 msgstr "Maksimalus parsiunčiamų laiškų skaičius"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 msgid "No limit if 0 is specified."
 msgstr "Nelimituojama, jei nurodyta „0“."
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "„Gauti visus“ tinkrina paštą šioje sąskaitoje"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Antraštė"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Pridėti „Date“ antraštės lauką"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Generuoti „Message-ID“"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Pridėti vartotojo nustatytas antraštes"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " Redaguoti... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Autentiškumo patikrinimas"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP autentiškumo patikrinimas (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4239,189 +4249,189 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Prieš siunčiant patikrinti autentiškumą su POP3"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 msgid "Command output"
 msgstr "Komandos išvestis"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Automatiškai nustatyti sekančius adresus"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Pasirašyti laiškus"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Koduoti laiškus"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr "Koduoti kai atsakoma į koduotą laišką"
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "Naudoti „ASCII-armored“ formatą kodavimui"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Naudoti „clear text“ parašą"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Parašo raktas"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Naudoti numatytąjį GnuPG raktą"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Parinkti raktą pagal jūsų el. pašto adresą"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Nurodyti raktą"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "Vartotojo arba rakto ID"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "Nenaudoti SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "Naudoti SSL POP3 prisijungimui"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Naudoti STARTTLS komandą SSL sesijos pradžiai"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "Naudoti SSL IMAP4 prisijungimui"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "Naudoti SSL NNTP prisijungimui"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Siuntimas (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "Naudoti SSL SMTP prisijungimui"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr "Naudoti „non-blocking SSL“"
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Išjunkite, jei turite problemų su SSL prisijungimais."
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "Nurodykite SMTP prievadą"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "Nurodykite POP3 prievadą"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "Nurodykite IMAP4 prievadą"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "Nurodykite NNTP prievadą"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Nurodykite domeno vardą"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "IMAP serverio katalogas"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Bus rodomi tik šio katalogo pakatalogiai."
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 msgid "Clear all message caches on exit"
 msgstr "Išvalyti laiškų laikinas kopijas (cache) išeinant"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Siųstus laiškus dėti į"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Juodraščius dėti į"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 msgid "Put queued messages in"
 msgstr "Laiškų eilę dėti į"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Ištrintus laiškus dėti į"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "Neįvestas sąskaitos pavadinimas."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "Neįvestas pašto adresas."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "Neįvestas SMTP serveris."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "Neįvestas vartotojo ID."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "Neįvestas POP3 serveris."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "Neįvestas IMAP4 serveris."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "Neįvestas NNTP serveris."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr "Nurodytas ne eilės katalogas."
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5979,84 +5989,84 @@ msgstr ""
 "įsitikines, kad ji pasieks jūsų norimą adresatą.\n"
 "Ar jus pakankamai pasitikite šiuo raktu?"
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "Neteisinga eilėje esančio laiško antraštė.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Laiškas siunčiama komanda: %s\n"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Negaliu įvykdyti komandos: %s"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Klaida vykdant komandą: %s"
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Jungiamasi"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Jungiuosi prie SMTP serverio: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "Siunčiu HELO..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "Tikrinamas autentiškumas"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 msgid "Sending message..."
 msgstr "Siunčiu laišką..."
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "Siunčiu EHLO..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Siunčiu MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Siunčiu"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Siunčiu RCTP TO..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Siunčiu DATA..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Išeinu..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Siunčiu laišką (%d / %d baitai)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Siunčiu laišką"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "Klaida siunčiant laišką."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/nl.po b/po/nl.po
index d9b4afe9..b2d9446d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+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"
@@ -699,7 +699,7 @@ msgstr ""
 msgid "Name"
 msgstr "Naam"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Protocol"
 
@@ -1160,7 +1160,7 @@ msgid "Group"
 msgstr "Groep"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Accounts"
@@ -1193,7 +1193,7 @@ msgstr "Bericht"
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Fout"
 
@@ -1606,7 +1606,7 @@ msgstr ""
 "Account voor het verzenden van email is niet gespecificeerd.\n"
 "Selecteer een account voordat u verzend."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Er is een fout opgetreden bij het versturen van het bericht naar %s."
@@ -1712,7 +1712,7 @@ msgstr "MIME-type"
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Verzenden"
@@ -1754,7 +1754,7 @@ msgid "Attach file"
 msgstr "Bestand bijvoegen"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Tekenen"
@@ -1961,7 +1961,7 @@ msgid " Check File "
 msgstr " Controleer bestand"
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Bestand"
 
@@ -2040,7 +2040,7 @@ msgid "Edit JPilot Entry"
 msgstr "Bewerk JPilot veld"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr "Bladeren..."
@@ -2105,7 +2105,7 @@ msgstr "Timeout (sec)"
 msgid "Maximum Entries"
 msgstr "Maximum aantal velden"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Algemeen"
 
@@ -2163,7 +2163,7 @@ msgid "Exporting file:"
 msgstr "Doelbestand:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr "Selecteer..."
 
@@ -2614,133 +2614,143 @@ msgstr "Afronden"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nieuwe berichten"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Bezig met identificatie"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "Een ogenblik geduld alstublieft"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Afgebroken"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Bezig met ophalen"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Klaar (%d bericht(en) (%s) ontvangen)"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "Klaar (geen nieuwe bercihten)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Identificatie mislukt"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Vergrendeld"
 
-#: src/inc.c:596
+#: src/inc.c:635
 msgid "Timeout"
 msgstr "Time-out"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Klaar (%d nieuwe bericht(en))"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Klaar (geen nieuwe berichten)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "Er is een fout opgetreden bij het ophalen van de e-mail."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "nieuwe berichten voor account %s worden opgehaald...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Bezig met identificatie"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Verbinden met POP3-server: %s ..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan niet verbinden met POP3 server: %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Bezig met identificatie..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Berichten ophalen van %s..."
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Opvragen van het aantal nieuwe berichten (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Opvragen van het aantal nieuwe berichten (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Opvragen van de grootte van de nieuwe berichten (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "Bezig met verwijderen van bericht %d"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Bezig met afsluiten"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Bericht wordt opgehaald (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ophalen (%d bericht(en) (%s) ontvangen)"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 msgid "Connection failed."
 msgstr "Verbinding mislukt."
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "Fout bij het verwerken van de e-mail"
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2749,29 +2759,29 @@ msgstr ""
 "Fout bij het verwerken van de e-mail:\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "De ruimte op de schijf is op."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "Het bestand is niet beschrijfbaar."
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "Socket-fout."
 
 #  consider EOF right after QUIT successful
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr "Verbinding verbroken door verbindingspartner."
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "Mailbox is vergrendeld."
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2780,11 +2790,11 @@ msgstr ""
 "Mailbox is vergrendeld:\n"
 "%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 msgid "Authentication failed."
 msgstr "Identificatie mislukt."
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2793,15 +2803,15 @@ msgstr ""
 "Identificatie mislukt:\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr "Sessie is verlopen."
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "E-mail verwerken geannuleerd\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Nieuwe berichten worden opgehaald van %s naar %s ...\n"
@@ -3678,7 +3688,7 @@ msgstr "E-mail van alle accounts ophalen en in de lijsten zetten"
 msgid "Send queued message(s)"
 msgstr "Verzend berichten uit de wachtrij"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Opstellen"
@@ -4040,217 +4050,217 @@ msgid ""
 "\n"
 msgstr "Slecht wachtwoord! Probeer opnieuw...\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Venster accountvoorkeuren wordt geopend...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Voorkeuren voor nieuw account"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Accountvoorkeuren"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Venster accountvoorkeuren wordt geopend...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Ontvangen"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Naam van dit account"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "Instellen als standaard"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Persoonlijke informatie"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Volledige naam"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "E-mail adres"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Organisatie"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Serverinformatie"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "Nieuws (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Niets (lokaal)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Deze server vereist authentificatie"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "Nieuwsserver"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Server om van te ontvangen"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "SMTP server (om te verzenden)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "Gebruikersnaam"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 msgid "Use secure authentication (APOP)"
 msgstr "Veilige identificatie gebruiken (APOP)"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Verwijder berichten op de server wanneer ze worden opgehaald"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Verwijderen na"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "dagen"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 msgid "0 days: remove immediately"
 msgstr "0 dagen: direct verwijderen"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Haal alle berichten op van server"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Limiet ontvangstgrootte"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Filter de berichten bij het ophalen"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Standaard inbox"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Ongefilterde berichten zullen hier opgeslagen worden"
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Identificatiemethode"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 msgid "Only check INBOX on receiving"
 msgstr "Alleen de INBOX op nieuwe e-mail controleren"
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "Nieuws"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 msgid "Maximum number of articles to download"
 msgstr "Maximum aantal te downloaden artikelen"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 msgid "No limit if 0 is specified."
 msgstr "Geen limiet als 0 is ingesteld."
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "'Alles ophalen' haalt de e-mail voor dit account op"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Header"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Datum veld toevoegen aan header"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Bericht-ID aanmaken"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Voeg een door de gebruiker gespecificeerde header toe"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr "Bewerken"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Identificatie"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP identificatie (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4262,189 +4272,189 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Identificatie met POP3 voor het verzenden"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 msgid "Command output"
 msgstr "Resultaat van opdracht"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Stel automatisch de volgende adressen in"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Antwoorden naar"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Standaard een identificatiehandtekening toevoegen"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Standaard het bericht coderen"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr "Versleutelen indien reactie op versleuteld bericht"
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "ASCII-versterkt formaat gebruiken voor codering"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Teksthandtekening gebruiken"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Signeersleutel"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Gebruik standaard GnuPG sleutel"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Selecteer sleutel naar e-mail adres"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Specificeer sleutel zelf"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "Gebruikers- of sleutel-ID:"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "Geen SSL gebruiken"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "SSL gebruiken voor POP3 verbinding"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Het STARTTLS commando gebruiken om een SSL sessie te starten"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL gebruiken voor IMAP verbinding"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "SSL gebruiken voor NNTP verbinding"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Verzenden (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "SSL gebruiken voor SMTP verbinding"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr "Niet-blokkerende SSL gebruiken"
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Zet dit uit als u problemen met de SSL-verbinding heeft."
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "SMTP poort"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "POP3 poort"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "IMAP4 poort"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "SMTP poort"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Specificeer domeinnaam"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "IMAP server-map"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Alleen de submappen van deze map zullen weergegeven worden."
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 msgid "Clear all message caches on exit"
 msgstr "Alle buffers legen bij afsluiten"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Verzonden berichten opslaan in"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Kladberichten opslaan in"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 msgid "Put queued messages in"
 msgstr "Wachtrijberichten opslaan in"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Verwijderde berichten opslaan in"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "Accountnaam is niet ingevuld."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "E-mail adres is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "SMTP server is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "Gebruikersnaam is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "POP3 server is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 server is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "NNTP server is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr "Aangegeven map kan niet gebruikt worden als wachtrij."
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6015,84 +6025,84 @@ msgstr ""
 "niet zeker dat het bericht bij de juiste persoon terecht komt.\n"
 "Wilt u desondanks doorgaan?"
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "De header van het bericht in de wachtrij is kapot.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Bericht wordt verzonden met de opdracht: %s\n"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "kan opdracht niet uitvoeren: %s"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Fout bij uitvoeren van opdracht: %s"
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Bezig met maken van verbinding"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Bezig met verbinden met SMTP server: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "Bezig met sturen van HELO..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "Bezig met identificatie"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 msgid "Sending message..."
 msgstr "Bericht verzenden..."
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "Bezig met sturen van EHLO..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Bezig met verzenden van MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Bezig met verzenden"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Bezig met verzenden van RCPT TO..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Bezig met verzenden van DATA..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Bezig met afsluiten..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Bezig met verzenden van bericht (%d / %d bytes)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Bezig met verzenden van bericht"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "Er is een fout opgetreden bij het verzenden."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/pl.po b/po/pl.po
index c116ec1a..e8c249fc 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.9.8 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+0900\n"
 "PO-Revision-Date: 2005-03-05 18:57+0100\n"
 "Last-Translator: Wit Wilinski <madman at linux dot bydg dot org>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -688,7 +688,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Protokół"
 
@@ -1155,7 +1155,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Katalog"
@@ -1188,7 +1188,7 @@ msgstr "Notatka"
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Błąd"
 
@@ -1607,7 +1607,7 @@ msgstr ""
 "Nie podano konta pocztowego do wysyłania wiadomości.\n"
 "Należy wybrać konto przed wysłaniem."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Błąd podczas wysyłania wiadomości do %s."
@@ -1710,7 +1710,7 @@ msgstr "typ MIME"
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Wyślij"
@@ -1752,7 +1752,7 @@ msgid "Attach file"
 msgstr "Dołącz plik"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Podpis"
@@ -1965,7 +1965,7 @@ msgid " Check File "
 msgstr " Sprawdź plik"
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Plik"
 
@@ -2043,7 +2043,7 @@ msgid "Edit JPilot Entry"
 msgstr "Edytuj wpis JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2108,7 +2108,7 @@ msgstr "Opóźnienie (sek)"
 msgid "Maximum Entries"
 msgstr "Maksymalna ilość pozycji"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Podstawowe"
 
@@ -2165,7 +2165,7 @@ msgid "Exporting file:"
 msgstr "Eksportowanie pliku:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr " Wybierz... "
 
@@ -2618,133 +2618,143 @@ msgstr "Koniec"
 msgid "Sylpheed: %d new messages"
 msgstr "Zakończono (%d nowe wiadomości)"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Uwierzytelnianie"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Pobieranie nowych wiadomości"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "Oczekiwanie"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Anulowano"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Pobieranie"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Gotowe (%d wiadomośći (%s) odebrano)"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "Gotowe (brak nowych wiadomości)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Błąd połączenia"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Błąd autoryzacji"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Zablokowano"
 
-#: src/inc.c:596
+#: src/inc.c:635
 msgid "Timeout"
 msgstr "Opóźnienie"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Zakończono (%d nowe wiadomości)"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Zakończono (brak nowych wiadomości)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "Wystąpiły błędy podczas pobierania poczty."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "pobieranie nowych wiadomości z konta %s ...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Uwierzytelnianie"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Pobieranie nowych wiadomości"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Nawiązywanie połączenia z serwerem POP3: %s..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nie można nawiązać połączenia z serwerem POP3: %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Uwierzytelnianie..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Pobieranie wiadomości z %s..."
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Pobieranie liczby nowych wiadomości (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Pobieranie liczby nowych wiadomości (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Pobieranie liczby nowych wiadomości (UIDL)"
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Pobieranie rozmiaru wiadomości (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "Usuwanie wiadomości %d"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Wychodzenie"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Pobieranie wiadomości (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Pobieranie (%d wiadomośći (%s) odebrano)"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 msgid "Connection failed."
 msgstr "Błąd połączenia."
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2753,28 +2763,28 @@ msgstr ""
 "Błąd podczas przetwarzania wiadomości:\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Brak miejsca na dysku."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "Nie można zapisać pliku."
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "Błąd gniazda."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr "Połączenie zamknięte przez zdalny komputer."
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "Skrzynka jest zablokowana."
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2783,11 +2793,11 @@ msgstr ""
 "Skrzynka jest zablokowana:\n"
 "%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 msgid "Authentication failed."
 msgstr "Błąd uwierzytelniania."
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2796,15 +2806,15 @@ msgstr ""
 "Błąd uwierzytelniania:\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr "Sesja wygasła."
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "Odbieranie anulowano\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Pobieranie wiadomości z %s do %s...\n"
@@ -3680,7 +3690,7 @@ msgstr "Odbierz nową pocztę z wszystkich kont"
 msgid "Send queued message(s)"
 msgstr "Wyślij wiadomości z kolejki"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Utwórz"
@@ -4018,224 +4028,224 @@ msgstr ""
 "Niewłaściwe hasło! Spróbuj ponownie...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Otwieranie okna preferencji konta...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Preferencje nowego konta"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Preferencje konta"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Tworzenie okna preferencji okna...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Odbieranie"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Prywatność"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Nazwa tego konta"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "Ustaw jako domyślne"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Informacje osobiste"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Pełna nazwa"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "Adres e-mail"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Organizacja"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Informacje o serwerze"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Żaden (lokalnie)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Ten serwer wymaga autoryzacji"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "Serwer news"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Serwer dla odbioru"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "Serwer SMTP (dla wysyłania)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "Identyfikator użytkownika"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Hasło"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 msgid "Use secure authentication (APOP)"
 msgstr "Użyj bezpiecznej autentykacji (APOP)"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Usuwanie wiadomości z serwera po odebraniu"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Usuwanie po"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "dniach"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dni: usuwa natychmiast)"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Pobieranie wszystkich wiadomości z serwera"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Ograniczenie wielkości pobierania"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Filtrowanie wiadomości podczas odbierania"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Domyślny inbox"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nieprzefiltrowane wiadomości zostaną zachowane w tym katalogu)"
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Sposób uwierzytelniania"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "Tylko przy ręcznym odbieraniu"
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maksymalna liczba pobieranych artykułów\n"
 "(bez ograniczeń - 0)"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "\"Odbierz wszystkie\" sprawdza pocztę dla tego konta"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Nagłówek"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Dodawanie pola Data do nagłówka"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Generowanie identyrikatora wiadomości"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Dodawanie nagłówka zdefiniowanego przez użytkownika"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr "Edycja..."
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Uwierzytelnianie SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4247,192 +4257,192 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Uwierzytelnianie POP3 przed wysyłaniem"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 msgid "Command output"
 msgstr "Wyjście polecenia"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Automatyczne ustawianie następujących adresów"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Kopia"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Ukryta kopia"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Adres zwrotny"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Domyślnie podpisywanie wiadomości"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Domyślnie szyfrowanie wiadomości"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "Używanie formatu ASCII-armored dla szyfrowania"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Wstawianie podpisu czystym tekstem"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Klucz"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Używanie standardowego klucza GnuPG"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Wybieranie klucz poprzez swój adres e-mail"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Ręczne określanie klucza"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "Użytkownik lub klucz ID:"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "Nie korzystanie z SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "Używanie SSL dla połączeń POP3"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Używanie polecenia STARTTLS by rozpocząć sesję SSL"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "Używanie SSL dla połączeń IMAP4"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "Używanie SSL dla połączeń NNTP"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Wysyłanie (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "Używanie SSL dla połączeń SMTP"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr "Używanie nieblokującego SSL"
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(Wyłącz to, jeśli masz problemy z połączeniem SSL)"
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "Określ port SMTP"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "Określ port POP3"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "Określ port IMAP4"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "Określ port NNTP"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Określ nazwę domeny"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "Katalog serwera IMAP4."
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Pobieranie wszystkich wiadomości z serwera"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Zapisywanie wysłanych wiadomości do"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Zapisywanie szablonów wiadomości do"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Zapisywanie usuniętych wiadomości do"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Zapisywanie usuniętych wiadomości do"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "Nie określono nazwy konta."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "Nie określono adresu e-mail."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "Nie określono serwera SMTP."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "Nie określono ID użytkownika."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "Nie określono serwera POP3."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "Nie określono serwera IMAP4."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "Nie określono serwera NNTP."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6018,84 +6028,84 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "Uszkodzony nagłówek wiadomości w kolejce.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Wysyłanie wiadomości z użyciem polecenia: %s\n"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Nie można wykonać polecenia: %s"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Błąd podczas wykonywania polecenia: %s"
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Podłączanie"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Łączenie z serwerem SMTP: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "Wysyłanie HELO..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "Uwierzytelnianie"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 msgid "Sending message..."
 msgstr "Wysyłanie wiadomości..."
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "Wysyłanie EHLO..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Wysyłanie MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Wysyłanie"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Wysyłanie RCPT TO..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Wysyłanie DATA..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Wychodzenie..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Wysyłanie wiadomości (%d / %d)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Wysyłanie wiadomości"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "Błąd podczas wysyłania wiadomości."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e19f23f9..5ae75ad5 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: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+0900\n"
 "PO-Revision-Date: 2006-10-25 14:15-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
@@ -697,7 +697,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nome"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -1159,7 +1159,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Pasta"
@@ -1192,7 +1192,7 @@ msgstr "Notificação"
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Erro"
 
@@ -1604,7 +1604,7 @@ msgstr ""
 "Conta para envio de mensagem não foi especificada.\n"
 "Por favor selecione uma conta de e-mail antes de enviar."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Erro ao postar a mensagem para %s ."
@@ -1716,7 +1716,7 @@ msgstr "Tipo MIME"
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Enviar"
@@ -1758,7 +1758,7 @@ msgid "Attach file"
 msgstr "Anexar arquivo"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Assinatura"
@@ -1965,7 +1965,7 @@ msgid " Check File "
 msgstr " Verificar Arquivo "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Arquivo"
 
@@ -2044,7 +2044,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2109,7 +2109,7 @@ msgstr "Timeout (segundos)"
 msgid "Maximum Entries"
 msgstr "Máximo de Entradas"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Básicas"
 
@@ -2168,7 +2168,7 @@ msgid "Exporting file:"
 msgstr "Arquivo a exportar:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr "Selecionar..."
 
@@ -2618,133 +2618,143 @@ msgstr "Terminar"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d novas mensagens"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Autenticando"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Obtendo novas mensagens"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "Aguardando"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Concluído (%d mensagen(s) (%s) recebida(s))"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "Feito (Não há mensagens novas)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Conexão falhou"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Autenticação falhou"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Travado"
 
-#: src/inc.c:596
+#: src/inc.c:635
 msgid "Timeout"
 msgstr "Tempo limite"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Concluído (%d nova(s) mensagem(ns))"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Concluído (Não há mensagens novas)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "Alguns erros aconteceram ao baixar os emails."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obtendo novas mensagens da conta %s...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Autenticando"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando novas mensagens"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando ao servidor POP3: %s..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Não foi possível se conectar ao servidor POP3: %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Recebendo mensagens de %s..."
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtendo o número de novas mensagens (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtendo o número de novas mensagens (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtendo o número de novas mensagens (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o número de novas mensagens (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "Apagando mensagem %d"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Saindo"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Baixando mensagem (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Recebendo (%d mensagem(ns) (%s) recebido)"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 msgid "Connection failed."
 msgstr "Falha na conexão"
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "Ocorreu um erro enquanto as mensagens eram processadas."
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2753,28 +2763,28 @@ msgstr ""
 "Erro ao processar mensagens:\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Não há espaço disponível no disco."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "Não foi possível gravar o arquivo."
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "erro de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr "Conexão remota finalizada pela estação remota."
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "Caixa de correio está travada."
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2783,11 +2793,11 @@ msgstr ""
 "Caixa de correio está trancada:\n"
 "%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2796,15 +2806,15 @@ msgstr ""
 "Falha de autenticação:\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr "Tempo limite da sessão."
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "Incorporação cancelada\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obtendo novas mensagens de %s até %s...\n"
@@ -3678,7 +3688,7 @@ msgstr "Incorporar novas mensagens de todas as contas"
 msgid "Send queued message(s)"
 msgstr "Enviar Mensagem(s) da fila"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Escrever"
@@ -4038,217 +4048,217 @@ msgstr ""
 "Senha errada! Tente novamente...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Abrindo janela de preferências da conta...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Conta%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Preferências para a nova conta"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Preferências da Conta"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Criando janela de preferências da conta...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Receber"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Avançadas"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Nome desta conta"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "Marcar como padrão"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Informações pessoais"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Nome completo"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Organização"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Informações do servidor"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "Notícias (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Nenhuma (local)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Este servidor requer autenticação"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "Servidor de notícias"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Servidor de recepção"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (envio)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "Usuario"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Senha"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 msgid "Use secure authentication (APOP)"
 msgstr "Usar autenticação segura (APOP)"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Ao receber, eliminar a(s) mensagem(ns) do servidor"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Remover depois de"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "dias"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 msgid "0 days: remove immediately"
 msgstr "0 dias: remover imediatamente"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Receber todas as mensagens no servidor"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Limite de tamanho de recebimento"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensagens ao receber"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Caixa de Entrada Padrão"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Mensagens não filtradas serão guardadas nesta pasta."
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Método de Autenticação"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 msgid "Only check INBOX on receiving"
 msgstr "Verificar apenas CAIXA DE ENTRADA no rebecimento"
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "Notícias"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artigos para baixar"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 msgid "No limit if 0 is specified."
 msgstr "Sem limite se 0 for especificado."
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Obter todas' confere novas mensagens nessa conta"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Cabeçalho"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Adicionar campo de data"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Gerar Message-ID"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Adicionar cabeçalho do usuário"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " Editar... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Autenticação"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticação SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4260,189 +4270,189 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Autenticar com POP3 antes de enviar"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 msgid "Command output"
 msgstr "Saída de comando"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Estabelecer os seguintes endereços automaticamente"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Responder"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Assinar mensagens por padrão"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Encriptar mensagems por padrão"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr "Encriptar quando responder uma mensagem encriptada"
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "Usar formato ASCII-armored para encriptação"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Inserir assinatura de texto puro"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Assinar chave"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Usar chave GnuPG padrão"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Selecionar chave através de seu endereço de e-mail"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Especificar chave manualmente"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "Usuário ou ID da chave:"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "Não usar SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "Utilizar SSL para conexão POP3"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Utilizar comando STARTTLS para iniciar a sessão SSL"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "Utilizar SSL para conexão IMAP4"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para conexão NNTP"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "Utilizar SSL para conexão SMTP"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr "Usar SSL não-bloqueante"
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Desabilite isso se você tiver problemas na conexão SSL"
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "Especifique a porta SMTP"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "Especifique a porta POP3"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "Especificar a porta IMAP4"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "Especificar a porta NNTP"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Especificar nome do domínio"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "Servidor de diretório IMAP"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Apenas as subpastas deste diretório serão exibidas."
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 msgid "Clear all message caches on exit"
 msgstr "Limpar todos os caches de mensagens ao sair"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Colocar mensagens enviadas em"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Colocar mensagens de rascunho em"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 msgid "Put queued messages in"
 msgstr "Colocar mensagens a serem enviadas em"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Colocar mensagens apagadas em"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "Nome da conta não definido."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "Endereço de e-mail não especificado."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "Servidor SMTP não especificado."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "Usuário não especificado."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "Servidor POP3 não especificado."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "Servidor IMAP4 não especificado."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "Servidor NNTP não especificado."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr "A pasta especificada não é do tipo fila."
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6006,84 +6016,84 @@ msgstr ""
 "saberá com certeza se ela irá com certeza para a pessoa que você deseja.\n"
 "Confia nela suficientemente para usá-la mesmo assim?"
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "Mensagem da fila com cabeçalho corrompido.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Enviando mensagem usando o comando: %s\n"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Não foi possível executar o comando: %s"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Erro ao executar comando: %s"
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Conectando com o servidor SMTP: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 msgid "Sending message..."
 msgstr "Enviando mensagem..."
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Enviando"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Enviando DATA..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Saindo..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando mensagem (%d / %d bytes)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Enviando mensagem"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "Ocorreu um erro ao enviar suas mensagens."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/ro.po b/po/ro.po
index c62a8d72..2d580211 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: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+0900\n"
 "PO-Revision-Date: 2006-10-24 19:06+0200\n"
 "Last-Translator: Cristian Secară <cristi@secarica.ro>\n"
 "Language-Team: \n"
@@ -704,7 +704,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nume"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Protocol"
 
@@ -1176,7 +1176,7 @@ msgid "Group"
 msgstr "Grupă"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Folder"
@@ -1209,7 +1209,7 @@ msgstr "Notificare"
 msgid "Warning"
 msgstr "Avertisment"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Eroare"
 
@@ -1624,7 +1624,7 @@ msgstr ""
 "Contul pentru trimitere mail nu a fost specificat.\n"
 "Vă rugăm să selectați un cont înainte de a trimite."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "A avut loc o eroare în timpul trimiterii mesajului pe %s ."
@@ -1738,7 +1738,7 @@ msgid "Size"
 msgstr "Dimensiune"
 
 # obs: comun și pentru butonul din toolbar și pentru tab-ul din common preferences și edit accounts
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Trimite"
@@ -1781,7 +1781,7 @@ msgid "Attach file"
 msgstr "Atașează fișier"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Semnătură"
@@ -1988,7 +1988,7 @@ msgid " Check File "
 msgstr " Verifică fișier "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Fișier"
 
@@ -2067,7 +2067,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editează înregistrare JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2133,7 +2133,7 @@ msgstr "Expirare de timp (secunde)"
 msgid "Maximum Entries"
 msgstr "Număr maxim de înregistrări"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "De bază"
 
@@ -2191,7 +2191,7 @@ msgid "Exporting file:"
 msgstr "Exportare fișier:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr " Selectează... "
 
@@ -2652,134 +2652,144 @@ msgstr "Terminat"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d mesaje noi"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Autentificare"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Recepționare mesaje noi"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "Așteptare"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Anulat"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Recepționare"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Gata (%d mesaj(e) (%s) primit(e))"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "Gata (nu există mesaje noi)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Conexiunea a eșuat"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Autentificarea a eșuat"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Blocat"
 
-#: src/inc.c:596
+#: src/inc.c:635
 msgid "Timeout"
 msgstr "Timp expirat"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Terminat (%d noi mesaj(e))"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Terminat (nu există mesaje noi)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "Au avut loc unele erori în timpul obținerii mail-ului."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obținere mesaje noi pentru contul %s...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Autentificare"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: recepționare mesaje noi"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectare la serverul POP3: %s ..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nu se poate efectua conexiunea la serverul POP3: %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Autentificare..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Recepționare mesaje de la %s..."
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obținerea numărului de mesaje noi (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obținerea numărului de mesaje noi (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obținerea numărului de mesaje noi (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obținerea dimensiunii mesajelor (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "Ștergere mesaje %d"
 
 # hm ?
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Închidere conexiune"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recepționare mesaj (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Recepționare (%d mesaj(e) (%s) primit(e))"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 msgid "Connection failed."
 msgstr "Conexiunea a eșuat"
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "A avut loc o eroare în timpul procesării mail-ului."
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2788,28 +2798,28 @@ msgstr ""
 "A avut loc o eroare în timpul procesării mail-ului.\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Nu mai este spațiu pe disc."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "Nu se poate scrie fișierul."
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "Eroare socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr "Conexiune închisă de serverul de la distanță."
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "Căsuța poștală este blocată"
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2818,11 +2828,11 @@ msgstr ""
 "Căsuța poștală este blocată:\n"
 "%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 msgid "Authentication failed."
 msgstr "Autentificare eșuată."
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2831,16 +2841,16 @@ msgstr ""
 "Autentificare eșuată:\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr "Timpul sesiunii a expirat."
 
 # ???
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "Încorporare anulată\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obținere mesaje noi de la %s în %s...\n"
@@ -3732,7 +3742,7 @@ msgid "Send queued message(s)"
 msgstr "Trimite eventualele mesaje din coada de așteptare"
 
 # obs: comun și pentru butonul din toolbar și pentru tab-ul din common preferences și edit accounts
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Compune"
@@ -4101,221 +4111,221 @@ msgstr ""
 "Frază secretă incorectă ! Încearcă din nou...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Deschidere fereastră de configurație cont...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Cont%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Preferințe pentru noul cont"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Preferințe cont"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Creare fereastră de preferințe cont...\n"
 
 # obs: tab-ul din common preferences și edit accounts
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Primire"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Intimitate"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Avansat"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Numele contului"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "Stabilește ca implicit"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Informatii personale"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Nume complet"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "Adresa de mail"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Organizație"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Informatii despre server"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Nimic (local)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Serverul necesită autentificare."
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "Server news"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Server pentru primire"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "Server SMTP (trimitere)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "Utilizator"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Parolă"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 msgid "Use secure authentication (APOP)"
 msgstr "Folosește autentificare securizată (APOP)"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Șterge mesajele de pe server la primire"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Șterge după"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "zile"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 msgid "0 days: remove immediately"
 msgstr "0 zile: șterge imediat"
 
 # hm ? sau pe server ?
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Descarcă toate mesajele de pe server"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Limită dimensiune pentru primire"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Filtrează mesajele la primire"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Inbox-ul implicit"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Mesajele nefiltrate vor fi stocate în acest folder."
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Metodă de autentificare"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Automat"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 msgid "Only check INBOX on receiving"
 msgstr "Verifică doar INBOX la primire"
 
 # !!! netradus !!!
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 msgid "Maximum number of articles to download"
 msgstr "Număr maxim de articole pentru descărcare"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 msgid "No limit if 0 is specified."
 msgstr "Fără limită dacă este specificat 0"
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "'Verifică tot' verifică eventuale mesaje noi (și) pentru acest cont"
 
 # !!! netradus !!!
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Header"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Adaugă câmp Dată"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Generează Message-ID"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Adaugă câmpuri definite de utilizator"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " Editare... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Autentificare"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentificare SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4327,192 +4337,192 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentifică cu POP3 înainte de a trimite"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 msgid "Command output"
 msgstr "Rezultat commandă"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Stabilire în mod automat a următoarelor câmpuri de adrese"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Semnează mesajele în mod implicit"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Criptează mesajele în mod implicit"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr "Criptează răspunsul la un mesaj criptat"
 
 # !!! lăsat netradus !!!
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "Folosește formatul de criptare ASCII-armored"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Folosește semnătură în text clar"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Semnează cheia"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Folosește cheia implicită GnuPG"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Selectează cheia după adresa dumneavoastră de e-mail"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Specifică manual cheia"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "ID utilizator sau cheie"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "Nu utiliza SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "Folosește SSL pentru conexiunea POP3"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Folosește comanda STARTTLS pentru a porni sesiunea SSL"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "Folosește SSL pentru conexiunea IMAP4"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "Folosește SSL pentru conexiunea NNTP"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Trimite (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "Folosește SSL pentru conexiunea SMTP"
 
 # hm ? sau fără blocare ?
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr "Folosește SSL non-blocking"
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Deselectați aici dacă aveți probleme cu conexiunea SSL."
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "Port SMTP"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "Port POP3"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "Specifică port IMAP4"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "Specifică port NNTP"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Nume domeniu"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "Director server IMAP"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Vor fi afișate numai subfolderele acestui director."
 
 # hm ?
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 msgid "Clear all message caches on exit"
 msgstr "Șterge la ieșire toate mesajele din cache"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Salvează mesajele trimise în"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Pune ciorna în"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 msgid "Put queued messages in"
 msgstr "Pune mesajele de la coadă în"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Pune mesajele șterse în"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "Nu este introdus numele contului."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "Adresa de mail nu a fost introdusă."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "Serverul SMTP nu a fost introdus."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "Numele de utilizator nu a fost introdus."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "Serverul POP3 nu a fost introdus."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "Serverul IMAP4 nu a fost introdus."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "Serverul NNTP nu a fost introdus."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr "Folderul specificat nu este folder de coadă."
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6101,85 +6111,85 @@ msgstr ""
 "că va ajunge la persoana la care intenționați să ajungă.\n"
 "Îi acordați suficientă încredere încât să o folosiți oricum ?"
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "Header-ul mesajului din coada de așteptare este invalid.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Trimitere mesaj utilizând comanda: %s\n"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Nu se poate executa comanda: %s"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "A avut loc o eroare în timpul executării comenzii: %s"
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Conectare"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Conectare la serverul SMTP: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "Trimitere HELO..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "Autentificare"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 msgid "Sending message..."
 msgstr "Trimitere mesaj..."
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "Trimitere HELO"
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Trimitere MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Trimitere"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Trimitere RCPT TO..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Trimitere DATA..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Părăsire..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Trimitere mesaj (%d / %d octeți)"
 
 # hm ? asta este o înștiințare sau o comandă ?
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Trimitere mesaj"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "A avut loc o eroare în timpul trimiterii mesajului."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/ru.po b/po/ru.po
index ad0d002a..5c9cb0ce 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+0900\n"
 "PO-Revision-Date: 2006-06-09 14:30+0400\n"
 "Last-Translator: Sergey Vlasov <vsu@altlinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -696,7 +696,7 @@ msgstr ""
 msgid "Name"
 msgstr "Имя"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Протокол"
 
@@ -1157,7 +1157,7 @@ msgid "Group"
 msgstr "Группа"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Папка"
@@ -1190,7 +1190,7 @@ msgstr "Уведомление"
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Ошибка"
 
@@ -1603,7 +1603,7 @@ msgstr ""
 "Учётная запись для отправки почты не определена.\n"
 "Пожалуйста, выберите её перед отправкой."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Произошла ошибка при отправке сообщения на %s ."
@@ -1709,7 +1709,7 @@ msgstr "Тип MIME"
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Отправить"
@@ -1751,7 +1751,7 @@ msgid "Attach file"
 msgstr "Вложить файл"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Подпись"
@@ -1959,7 +1959,7 @@ msgid " Check File "
 msgstr " Проверить файл "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Файл"
 
@@ -2037,7 +2037,7 @@ msgid "Edit JPilot Entry"
 msgstr "Редактирование записи JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2102,7 +2102,7 @@ msgstr "Тайм-аут (сек)"
 msgid "Maximum Entries"
 msgstr "Максимальный размер результата"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Основные"
 
@@ -2160,7 +2160,7 @@ msgid "Exporting file:"
 msgstr "Экспортировать в файл:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr " Выбор... "
 
@@ -2610,133 +2610,143 @@ msgstr "Завершение"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed (новых сообщений: %d)"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Аутентификация"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Получение новых сообщений"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "Ожидание"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Отменена"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Получение"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Выполнено (принято сообщений: %d (%s))"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "Выполнено (нет новых сообщений)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Ошибка соединения"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Неверный пароль"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Занято"
 
-#: src/inc.c:596
+#: src/inc.c:635
 msgid "Timeout"
 msgstr "Нет ответа"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Завершено (новых сообщений: %d)"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Завершено (нет новых сообщений)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "При получении сообщений возникли ошибки."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "получение новых сообщений для учётной записи %s...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Аутентификация"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Получение новых сообщений"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Соединение с сервером POP3: %s..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не удалось соединиться с сервером POP3: %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Аутентификация..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Получение сообщений с %s..."
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Получение количества новых сообщений (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Получение количества новых сообщений (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Получение количества новых сообщений (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Получение размера сообщений (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "Удаление сообщения %d"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Выход"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получение сообщения (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Приём (принято сообщений: %d (%s))"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 msgid "Connection failed."
 msgstr "Ошибка соединения"
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "Произошла ошибка при обработке сообщений."
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2745,28 +2755,28 @@ msgstr ""
 "Произошла ошибка при обработке сообщений:\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Нет места на диске."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "Ошибка записи в файл."
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "Ошибка сокета."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr "Сервер закрыл соединение."
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "Почтовый ящик занят."
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2775,11 +2785,11 @@ msgstr ""
 "Почтовый ящик занят:\n"
 "%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 msgid "Authentication failed."
 msgstr "Ошибка аутентификации."
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2788,15 +2798,15 @@ msgstr ""
 "Ошибка аутентификации:\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr "Время сеанса истекло."
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "Приём сообщений прерван\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Получение новых сообщений из %s в %s...\n"
@@ -3670,7 +3680,7 @@ msgstr "Получить сообщения со всех учётных зап�
 msgid "Send queued message(s)"
 msgstr "Отправить сообщения из очереди"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Написать"
@@ -4031,217 +4041,217 @@ msgstr ""
 "Неверно! Повторите...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Открытие окна настроек учётной записи...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Учётная запись %d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Настройки новой учётной записи"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Настройки учётной записи"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Создание окна настроек учётной записи...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Приём"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Защита"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Имя учётной записи"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "По умолчанию"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Личная информация"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Полное имя"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "Адрес E-Mail"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Организация"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Сведения о серверах"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "Новостной (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Нет (локальный)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Этот сервер требует аутентификации"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "Сервер новостей"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Сервер для приёма"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "Сервер SMTP (для отправки)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "Имя пользователя"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Пароль"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 msgid "Use secure authentication (APOP)"
 msgstr "Использовать безопасную аутентификацию (APOP)"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Удалять сообщения с сервера после приёма"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Удалить через"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "дней"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 msgid "0 days: remove immediately"
 msgstr "0 дней: удалить немедленно"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Принимать все сообщения с сервера"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Принимать только сообщения размером не более"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "КБ"
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Фильтровать сообщения при приёме"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Папка для входящих сообщений"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Неотфильтрованные сообщения будут сохранены в этой папке."
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Метод аутентификации"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Автоматически"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 msgid "Only check INBOX on receiving"
 msgstr "Проверять только папку входящих сообщений (INBOX) при приёме"
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "Новости"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 msgid "Maximum number of articles to download"
 msgstr "Наибольшее число статей для загрузки"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 msgid "No limit if 0 is specified."
 msgstr "Не ограничено, если указан 0."
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "Проверять по команде \"Получить все\""
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Заголовок"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Добавить в заголовок поле Date"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Создавать Message-ID"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Добавить дополнительные заголовки"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " Определить... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Аутентификация"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Аутентификация SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4253,189 +4263,189 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Проверка пароля через POP3 перед отправкой"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 msgid "Command output"
 msgstr "Вывод команды"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Автоматически устанавливать адреса"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Копия"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Скрытно"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Адрес для ответов"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Подписывать сообщения по умолчанию"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Шифровать сообщения по умолчанию"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr "Шифровать ответы на зашифрованные сообщения"
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "Использовать ASCII-кодирование при шифровании"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Использовать открытую текстовую подпись"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Ключ подписи"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Ключ GnuPG по умолчанию"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Ключ для выбранного адреса E-mail"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Другой ключ"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "ID пользователя ключа:"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "Не использовать SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "Использовать SSL для соединения POP3"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Использовать команду STARTTLS для начала сеанса SSL"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "Использовать SSL для соединения IMAP4"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "Использовать SSL для соединения NNTP"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Отправка (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "Использовать SSL для соединения SMTP"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr "Использовать неблокирующий режим SSL"
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Выключите эту опцию, если возникают проблемы при использовании SSL."
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "Порт SMTP"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "Порт POP3"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "Порт IMAP4"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "Порт NNTP"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Имя домена"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "Каталог сервера IMAP4"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Будут отображены только подкаталоги этого каталога."
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 msgid "Clear all message caches on exit"
 msgstr "Очищать кеш сообщений при выходе"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Сохранять отправленные сообщения в"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Сохранять черновики в"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 msgid "Put queued messages in"
 msgstr "Сохранять сообщения, ожидающие отправки, в"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Сохранять удалённые сообщения в"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "Не указано имя учётной записи."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "Не указан адрес E-Mail."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "Не указан сервер SMTP."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "Не указано имя пользователя."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "Не указан сервер POP3."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "Не указан сервер IMAP4."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "Не указан сервер NNTP."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr "Указанная папка не является папкой очереди сообщений."
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6001,84 +6011,84 @@ msgstr ""
 "тем человеком, который указан в User ID ключа.\n"
 "Использовать этот ключ, несмотря на отсутствие доверия?"
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "Заголовок сообщения в очереди испорчен.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Отправка сообщения с помощью команды: %s\n"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Не удалось выполнить команду: %s"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Произошла ошибка при выполнении команды: %s"
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Соединение"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Соединение с сервером SMTP: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "Передача HELO..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "Аутентификация"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 msgid "Sending message..."
 msgstr "Отправка сообщения..."
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "Передача EHLO..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Передача MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Отправка"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Передача RCPT TO..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Отправка данных..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Завершение..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Отправка сообщения (%d / %d байт)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Отправка сообщения"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "Произошла ошибка при отправке сообщения."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/sk.po b/po/sk.po
index 9f99c4d3..ce3c3f9c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+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"
@@ -689,7 +689,7 @@ msgstr ""
 msgid "Name"
 msgstr "Meno"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -1156,7 +1156,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Priečinok"
@@ -1189,7 +1189,7 @@ msgstr "Upozornenie"
 msgid "Warning"
 msgstr "Varovanie"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Chyba"
 
@@ -1640,7 +1640,7 @@ msgstr ""
 "Nie je určené konto pre odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštové konto."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Pri odosielaní správy na %s nastala chyba."
@@ -1745,7 +1745,7 @@ msgstr "MIME typ"
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Odoslať"
@@ -1787,7 +1787,7 @@ msgid "Attach file"
 msgstr "Pripojiť súbor"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Podpis"
@@ -2001,7 +2001,7 @@ msgid " Check File "
 msgstr "Testovať súbor"
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Súbor"
 
@@ -2080,7 +2080,7 @@ msgid "Edit JPilot Entry"
 msgstr "Upraviť záznam JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2145,7 +2145,7 @@ msgstr "Timeout (v sekundách)"
 msgid "Maximum Entries"
 msgstr "Maximum záznamov"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Základné"
 
@@ -2203,7 +2203,7 @@ msgid "Exporting file:"
 msgstr "Exportovaný súbor:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr "Zvoľte..."
 
@@ -2658,134 +2658,144 @@ msgstr "Dokončiť"
 msgid "Sylpheed: %d new messages"
 msgstr "Dokončené (%d nových správ)"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Autentizácia"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Prijímam nové správy"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "Čakajte"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Zrušené"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Prijímam"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hotovo (%d správ (%s) prijatých)"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "Hotovo (žiadne nové správy)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Autentizácia zlyhala"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Zamknuté"
 
-#: src/inc.c:596
+#: src/inc.c:635
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (v sekundách)"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Dokončené (%d nových správ)"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Dokončené (žiadne nové správy)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "Pri prijímaní pošty sa vyskytli chyby."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "prijímam nové správy pre konto %s...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Autentizácia"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prijímam nové správy"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Pripájam sa k serveru POP3: %s..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Autentizácia..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Prijímam správy z %s..."
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Získavam počet nových správ (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Získavam počet nových správ (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Získavam počet nových správ (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Získavam veľkosť správ (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "Odstraňujem správu %d"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Odpájam sa"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prijímam správu (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Prijímam (%d správ (%s) prijatých)"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 msgid "Connection failed."
 msgstr "Spojenie zlyhalo."
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2794,28 +2804,28 @@ msgstr ""
 "Pri spracovávaní pošty sa vyskytla chyba:\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Na disku už nie je miesto."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "Nedá sa zapisovať do súboru."
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "Chyba socketu."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr "Vzdialený hostiteľ ukončil spojenie."
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "Mailbox je zamknutý."
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2824,11 +2834,11 @@ msgstr ""
 "Mailbox je zamknutý:\n"
 "%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 msgid "Authentication failed."
 msgstr "Autentizácia bola neúspešná."
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2837,16 +2847,16 @@ msgstr ""
 "Autentizácia bola neúspešná:\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 #, fuzzy
 msgid "Session timed out."
 msgstr "čas spojenia vypršal\n"
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "Začleňovanie zrušené\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Prijímam nové správy z %s do %s...\n"
@@ -3749,7 +3759,7 @@ msgstr "Prijať novú poštu pre všetky kontá"
 msgid "Send queued message(s)"
 msgstr "Odoslať správy vo fronte"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Nová správa"
@@ -4090,225 +4100,225 @@ msgstr ""
 "Neplatné heslo! Skúste znova...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Otváram okno nastavenia konta...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Nastavenie nového konta"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Nastavenie konta"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Vytváram okno nastavenia konta...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Prijať"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Súkromie"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Rozšírené"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Názov tohto konta"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "Nastaviť ako východzie"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Osobné informácie"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Celé meno"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "E-mailová adresa"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Organizácia"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Informácie o serveri"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Žiadne (lokálne)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentizáciu"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "News server"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Server pre prijímanie"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "SMTP server (odosielanie)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "Prihlasovacie meno"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Heslo"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Tento server vyžaduje autentizáciu"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Vymazať správy na serveri po ich prijatí"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Vymazať po"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "dňoch"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dní: zmazať ihneď)"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Prijať všetky správy na serveri"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Obmedzenie veľkosti správy pre príjem"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Filtrovať správy pri prijatí"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Východzí inbox"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nefiltrované správy budú umiestnené v tomto priečinku)"
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Metóda autentizácie"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Automatická"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "Len pri manuálnom prijímaní"
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "Diskusné skupiny"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maximálny počet príspevkov na stiahnutie\n"
 "(0 pre neobmedzený počet)"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Nie je určený príjemca."
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "Pri voľbe 'Prijať všetko' prijať správy aj pre toto konto"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Hlavička"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Pridať dátum do hlavičky"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Generovať Message-ID"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Pridať uživateľom definované hlavičky"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " Upresniť... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Autentizácia"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Autentizácia (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4321,192 +4331,192 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentizovať cez POP3 pred odosielaním"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 msgid "Command output"
 msgstr "Výstup príkazu"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Kópia"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Slepá kópia"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Odpovedať komu"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Implicitne podpísať správu"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Implicitne zašifrovať správu"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "Šifrovať do ASCII-armored tvaru"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Podpísať čistým textom"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Kľúč pre podpis"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Použiť východzí kľúč GnuPG"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Zvoliť kľúč podľa vašej emailovej adresy"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Zadať kľúč ručne"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "User alebo key ID:"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "Nepoužívať SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "Použiť SSL pre POP3 spojenie"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Použiť príkaz STARTTLS pre nadviazanie SSL spojenia"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "Použiť SSL pre IMAP4 spojenie"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "Použiť SSL pre NNTP spojenie"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Odoslať (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "Použiť SSL pre SMTP spojenie"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr "Používať non-blocking SSL"
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(Vypnite túto voľbu ak máte problémy pri SSL spojeniach)"
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "Určiť SMTP port"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "Určiť POP3 port"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "Určiť IMAP4 port"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "Určiť NNTP port"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Určiť názov domény"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "Priečinok serveru IMAP"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Prijať všetky správy na serveri"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Uložiť odoslané správy do"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Uložiť koncepty do"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Uložiť vymazané správy do"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Uložiť vymazané správy do"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "Nebol zadaný názov konta."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "Nebola zadaná e-mailová adresa."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "Nebol zadaný SMTP server."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "Nebol zadaný user ID."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "Nebol zadaný POP3 server."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "Nebol zadaný IMAP4 server."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "Nebol zadaný NNTP server."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6131,84 +6141,84 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "Hlavička správy vo fronte je poškodená.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Vykonať"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Pri odosielaní správy nastala chyba."
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Pripájanie"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Pripájam sa k serveru SMTP: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "Posielam HELO..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "Autentizácia"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 msgid "Sending message..."
 msgstr "Odosielam správu..."
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "Posielam EHLO..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Posielam MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Posielam"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Posielam RCPT TO..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Posielam DATA..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Odpájam sa..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Odosielam správu"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "Pri odosielaní správy nastala chyba."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/sl.po b/po/sl.po
index 5eba4d14..6214dc52 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+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"
@@ -697,7 +697,7 @@ msgstr ""
 msgid "Name"
 msgstr "Ime"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -1161,7 +1161,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Mapa"
@@ -1194,7 +1194,7 @@ msgstr "Opomba"
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Napaka"
 
@@ -1646,7 +1646,7 @@ msgstr ""
 "Račun za pošiljanje pošte ni določen.\n"
 "Prosim, pred pošiljanjem izberite poštni račun."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Med pošiljanjem sporočila %s je prišlo do napake."
@@ -1750,7 +1750,7 @@ msgstr "Tip MIME"
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Pošlji"
@@ -1792,7 +1792,7 @@ msgid "Attach file"
 msgstr "Pripni datoteko"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Podpis"
@@ -2007,7 +2007,7 @@ msgid " Check File "
 msgstr " Preveri Datoteko "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Datoteka"
 
@@ -2085,7 +2085,7 @@ msgid "Edit JPilot Entry"
 msgstr "Urejanje vnosa JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2150,7 +2150,7 @@ msgstr "Čas izteka (sek.)"
 msgid "Maximum Entries"
 msgstr "Največje št. vnosov"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Osnovno"
 
@@ -2207,7 +2207,7 @@ msgid "Exporting file:"
 msgstr "Izvozi datoteko:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr " Izberi... "
 
@@ -2663,190 +2663,200 @@ msgstr "Končaj"
 msgid "Sylpheed: %d new messages"
 msgstr "Končano (%d novih sporočil)"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Overovljam"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Prenašam nova sporočila"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "V pripravljenosti"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Preklicano"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Prenašam"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Opravljeno (%d sporočil (%s) prejetih)"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "Opravljeno (ni novih sporočil)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Overovitev ni uspela"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Zaklenjeno"
 
-#: src/inc.c:596
+#: src/inc.c:635
 #, fuzzy
 msgid "Timeout"
 msgstr "Čas izteka (sek.)"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Končano (%d novih sporočil)"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Končano (ni novih sporočil)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "Med prejemanjem pošte je prišlo do nekaterih napak."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "sprejemam nova sporočila z računa %s...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Overovljam"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prenašam nova sporočila"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se s strežnikom POP: %s"
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne morem se povezati s strežnikom POP: %s%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Overovljam..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Ugotavljam število novih sporočil (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Ugotavljam število novih sporočil (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Ugotavljam število novih sporočil (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Ugotavljam velikost sporočil (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "Brišem sporočilo %d"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Zapuščam"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prenašam sporočilo (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Opravljeno (%d sporočil (%s) prejetih)"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 #, fuzzy
 msgid "Connection failed."
 msgstr "Povezava ni uspela"
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Na disku ni prostora."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "Ne morem napisati datoteke."
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "napaka v priključku."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "Poštni predal je zaklenjen."
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Poštni predal je zaklenjen."
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "Pripojitev odpovedana\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Pobiram nova sporočila iz %s v %s...\n"
@@ -3753,7 +3763,7 @@ msgstr "Pripoji novo pošto z vseh računov"
 msgid "Send queued message(s)"
 msgstr "Pošlji čakajoča sporočila"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Sestavi"
@@ -4094,224 +4104,224 @@ msgstr ""
 "Napačna šifrirna fraza! Poskusite znova...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Odpiram okno za nastavitve računa...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Račun%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Nastavitve novega računa"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Nastavitve računa"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Ustvarjam okno za nastavitve računa...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Sprejmi"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Zasebnost"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Ime tega računa"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "Nastavi kot privzeto"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Osebni podatki"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Polno ime"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "Poštni naslov"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Organizacija"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Podatki o strežniku"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "Novice (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Noben (lokalen)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Ta strežnik zahteva overovitev"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "Novičarski strežnik"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Strežnik za sprejemanje"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "Strežnik SMTP (pošiljanje)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "Uporabniško ime"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Geslo"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Ta strežnik zahteva overovitev"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Ob sprejemu odstrani sporočila s strežnika"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Odstrani po"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "dneh"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dnevih: odstrani nemudoma)"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Naloži vsa sporočila na strežniku"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Omejitev dolžine pri sprejemanju"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Filtriranje sporočil ob sprejemu"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Privzeta mapa za prejeto pošto"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nefiltrirana sporočila bodo shranjena v tej mapi)"
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Overovitvena metoda"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "Novice"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Največje število člankov za nalaganje\n"
 "(neomejeno, če podate 0)"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Naslovnik ni določen."
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Poberi vsa' preveri novo pošto na tem računu"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Zaglavje"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Dodaj polje z datumom v zaglavje"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Generiran ID sporočila"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Dodaj uporabniško definirano zaglavje"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " Uredi... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Overovitev"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Avtentikacija SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4324,192 +4334,192 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Pred pošiljanjem avtenticiraj s POP3"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 #, fuzzy
 msgid "Command output"
 msgstr "Ukaz"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Samodejno nastavi sledeče naslove"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Kp:"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Skp:"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Odgovor za"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Privzeto podpiši sporočilo"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "privzeto zakodiraj sporočio"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "Uporabi oklopljen zapis ASCII za enkripcijo"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Uporabi jasen tekstovni podpis"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Ključ za podpisovanje"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Uporabi privzet ključ GnuPG"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Izberi ključ glede na vaš el. naslov"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Ročno določi ključ"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "Uporabnik ali ID ključa"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "Ne uporabljaj SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "Uporabi SSL za povezavo POP3"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Uporabi ukaz STARTTLS za pričetek seje SSL"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "Uporabi SSL za povezavo IMAP4"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "Uporabi SSL za povezavo NNTP"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Pošlji (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "Uporabi SSL za povezavo SMTP"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "Vnesite vrata SMTP"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "Vnesite vrata POP3"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "Vnesite vrata IMAP4"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "Vnesite vrata NNTP"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Vnesite ime domene"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "Imenik strežnika IMAP"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Naloži vsa sporočila na strežniku"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Postavi poslana sporočila v"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Postavi osnutke sporočil v"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Postavi izbrisana sporočila v"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Postavi izbrisana sporočila v"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "Ime računa ni vnešeno."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "Elektronski naslov ni naveden."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "Strežnik SMTP ni naveden."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "Uporabnikov ID ni vnešen."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "Strežnik POP3 ni vnešen."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "Strežnik IMAP4 ni naveden."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "Strežnik NNTP ni naveden."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6133,85 +6143,85 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "Zaglavje čakajočega sporočila je razbito.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Pošiljam sporočilo (%d / %d zlogov)"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Ne morem pognati zunanjega ukaza: %s\n"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Povezovanje"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Povezujem se s strežnikom SMTP: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "Pošiljam HELO..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "Overovljam"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 #, fuzzy
 msgid "Sending message..."
 msgstr "Pošiljam sporočilo"
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "Pošiljam EHLO..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Pošiljam MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Pošiljanje"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Pošiljam RCPT TO..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Pošiljam DATA..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Zapuščam..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Pošiljam sporočilo (%d / %d zlogov)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Pošiljam sporočilo"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "Med pošiljanjem sporočila je prišlo do napake."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/sr.po b/po/sr.po
index 21754755..6b620c82 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -697,7 +697,7 @@ msgstr ""
 msgid "Name"
 msgstr "Ime"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -1155,7 +1155,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Direktorijum"
@@ -1188,7 +1188,7 @@ msgstr "Obaveštenje"
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Greška"
 
@@ -1640,7 +1640,7 @@ msgstr ""
 "Nalog za slanje pošte nije definisan.\n"
 "Odaberite nalog pre slanja."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
@@ -1745,7 +1745,7 @@ msgstr "MIME tip"
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Pošalji"
@@ -1787,7 +1787,7 @@ msgid "Attach file"
 msgstr "Prikači datoteku"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Potpis"
@@ -2002,7 +2002,7 @@ msgid " Check File "
 msgstr " Proveri datoteku "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Datoteka"
 
@@ -2080,7 +2080,7 @@ msgid "Edit JPilot Entry"
 msgstr "Izmenite JPilot unos"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2145,7 +2145,7 @@ msgstr "Timeout (sek)"
 msgid "Maximum Entries"
 msgstr "Max. Unos"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Osnovno"
 
@@ -2202,7 +2202,7 @@ msgid "Exporting file:"
 msgstr "Izvozim datoteku:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr " Odaberite... "
 
@@ -2658,190 +2658,200 @@ msgstr "Gotovo"
 msgid "Sylpheed: %d new messages"
 msgstr "Završeno (%d novih poruka)"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Provera identiteta"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Primam nove poruke"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "Standby"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Primam"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Gotovo (%d poruke/a (%s) primljeno)"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Veza nije ostvarena"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Identifikacija nije uspela"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Zaključano"
 
-#: src/inc.c:596
+#: src/inc.c:635
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Završeno (%d novih poruka)"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "Došlo je do grešaka prilikom primanja pošte."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "primam nove poruke za nalog %s...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Provera identiteta"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Primam nove poruke"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se na POP3 server: %s ..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne mogu se povezati na POP3 server: %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Preuzimam broj novih poruka (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Preuzimam broj novih poruka (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Preuzimam broj novih poruka (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Preuzimam veličinu poruka (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "Brišem poruke %d"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Izlazim"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Gotovo (%d poruke/a (%s) primljeno)"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 #, fuzzy
 msgid "Connection failed."
 msgstr "Veza nije ostvarena"
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Nema više mesta na disku."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "Ne mogu pisati u datoteku."
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "Protokol greška."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "Sanduče je zaključano."
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Sanduče je zaključano."
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Način provere identieta"
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Način provere identieta"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "Incorporation otkazano\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Primam nove poruke od %s u %s...\n"
@@ -3749,7 +3759,7 @@ msgstr "Prima novu poštu sa svih naloga"
 msgid "Send queued message(s)"
 msgstr "Šalje odložene poruku/e"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Napiši"
@@ -4090,224 +4100,224 @@ msgstr ""
 "Pogrešna lozinka! Pokušajte ponovo...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Otvaram prozor za svojstva naloga...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Nalog%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Podešavanja za novi nalog"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Podešavanje naloga"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Stvaranje prozora za podešavanje naloga...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Primanje"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Privatnost"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Ime ovog naloga"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "Postavi kao uobičajeni"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Lične informacije"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Puno ime"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Organizacija"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Informacije o serveru"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Ništa (lokalno)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Ovaj server zahteva proveru identiteta"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "News server"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Server za primanje"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "SMTP server (slanje)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "ID korisnika"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Lozinka"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Ovaj server zahteva proveru identiteta"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Ukloni poruke sa servera nakon primanja"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Ukloni posle"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "dana"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dana: odmah ukloni)"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Preuzmi sve poruke sa servera"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Ograničenje u veličini za primanje"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Filtriraj poruke pri primanju"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Uobičajeno sanduče"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nefiltrirane poruke biti će stavljene u ovaj direktorijum)"
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Način provere identieta"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Automatski"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maksimalni broj članaka za preuzimanje\n"
 "(0 je za neograničeno)"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Primalac nije upisan."
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Primi sve' proverava poruke za ovaj nalog"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Zaglavlje"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Dodaj polje Datum u zaglavlje"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Generiši ID poruke"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Dodaj zaglavlje korisnika"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " Izmeni... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Provera identiteta"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP identifikacija (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4320,192 +4330,192 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Proveri identitet sa POP3 pre slanja"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 #, fuzzy
 msgid "Command output"
 msgstr "Naredba"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Automatski postavi sledeće adrese"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Odvovori-Na"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Uvek potpiši poruke"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Uvek šifruj poruke"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "Koristi ASCII-armored format za šifrovanje"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Koristi prazan tekst za potpis"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Ključ potpisa"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Koristi uobičajeni GnuPG ključ"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Odaberi ključ po adresi e-pošte"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Navedi neki drugi ključ"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "ID ključa ili korisnika:"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "Ne koristi SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "Koristi SSL za POP3 veze"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Korsiti STARTTLS naredbu za pokretanje SSL-a"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "Koristi SSL za IMAP4 veze"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "Koristi SSL za NNTP veze"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Slanje (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "Koristi SSL za SMTP veze"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "Navedi SMTP port"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "Navedi POP3 port"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "Navedi IMAP4 port"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "Navedi NNTP port"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Navedi ime domena"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "Direktorijum IMAP servera"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Preuzmi sve poruke sa servera"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Stavi poslate poruke u"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Stavi nedovršene poruke u"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Stavi obrisane poruke u"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Stavi obrisane poruke u"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "Ime naloga nije upisano."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "Adresa e-pošte nije upisana."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "SMTP server nije upisan."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "ID korisnika nije upisan."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "POP3 server nije upisan."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 server nije upisan."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "NNTP server nije upisan."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6129,88 +6139,88 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "Zaglavlje odložene poruke je loše.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Šaljem poruku (%d / %d bajtova)"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Ne mogu izvršiti spoljašnu naredbu: %s\n"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Povezujem se"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Spajam se na SMTP server: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 #, fuzzy
 msgid "Sending HELO..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 #, fuzzy
 msgid "Authenticating"
 msgstr "Provera identiteta"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 #, fuzzy
 msgid "Sending message..."
 msgstr "Šaljem poruku"
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 #, fuzzy
 msgid "Sending EHLO..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Šaljem"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Šaljem RCPT TO..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Šaljem DATA..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Završavnje..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Šaljem poruku (%d / %d bajtova)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Šaljem poruku"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "Došlo je do greške prilikom slanja poruke."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/sv.po b/po/sv.po
index 27f7d261..15aa5b8b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+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"
@@ -694,7 +694,7 @@ msgstr ""
 msgid "Name"
 msgstr "Namn"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -1152,7 +1152,7 @@ msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Mapp"
@@ -1185,7 +1185,7 @@ msgstr "Notera"
 msgid "Warning"
 msgstr "Varning"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Fel"
 
@@ -1603,7 +1603,7 @@ msgstr ""
 "Konto för att skicka post är inte specificerat.\n"
 "Välj ett e-postkonto innan du skickar."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fel uppstod när meddelandet skulle skickas till %s."
@@ -1710,7 +1710,7 @@ msgstr "MIME-typ"
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Skicka"
@@ -1752,7 +1752,7 @@ msgid "Attach file"
 msgstr "Bifoga fil"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Signatur"
@@ -1961,7 +1961,7 @@ msgid " Check File "
 msgstr " Kontrollera fil "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Fil"
 
@@ -2039,7 +2039,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redigera JPilot-post"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2104,7 +2104,7 @@ msgstr "Väntetid (sek)"
 msgid "Maximum Entries"
 msgstr "Maximalt antal poster"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Grundläggande"
 
@@ -2161,7 +2161,7 @@ msgid "Exporting file:"
 msgstr "Exporterar fil:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr " Välj... "
 
@@ -2613,133 +2613,143 @@ msgstr "Avsluta"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nya meddelanden"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Autentiserar"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Hämtar nya meddelanden"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "Vänta"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Hämtar"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Färdig (%d meddelande(n) (%s) mottagna)"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "Färdig (inga nya meddelanden)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Förbindelse misslyckades"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Autentisering misslyckades"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Låst"
 
-#: src/inc.c:596
+#: src/inc.c:635
 msgid "Timeout"
 msgstr "Slut på väntetid"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Avslutad (%d nya meddelanden)"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Avslutad (inga nya meddelanden)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "Fel uppstod vid hämtning av post."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "hämtar nya meddelanden från kontot %s...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Autentiserar"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Hämtar nya meddelanden"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Ansluter till POP3-server: %s ..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan inte ansluta till POP3-server: %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Autentiserar..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Hämtar meddelanden från %s..."
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Tar emot meddelandenas antal (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Tar emot meddelandenas antal (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Tar emot meddelandenas antal (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Tar emot meddelandenas storlek (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "Tar bort meddelande %d"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Avslutar"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Tar emot meddelande (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Hämtar (%d meddelande(n) (%s) mottagna)"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 msgid "Connection failed."
 msgstr "Förbindelse misslyckades."
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "Fel uppstod när e-posten behandlades."
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2748,28 +2758,28 @@ msgstr ""
 "Fel uppstod när e-posten behandlades:\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Inget diskutrymme kvar."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "Kan inte skriva fil."
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "Fel på uttag (socket)."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr "Anslutningen stängdes av fjärrvärden."
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "Brevlådan är låst."
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2778,11 +2788,11 @@ msgstr ""
 "Brevlådan är låst:\n"
 "%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 msgid "Authentication failed."
 msgstr "Autentisering misslyckades."
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2791,15 +2801,15 @@ msgstr ""
 "Autentisering misslyckades:\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr "Sessionens väntetid tog slut."
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "Inkorporering avbruten\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Hämtar nya meddelanden från %s till %s...\n"
@@ -3679,7 +3689,7 @@ msgstr "Hämta ny post från alla konton"
 msgid "Send queued message(s)"
 msgstr "Skicka köade meddelanden"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Skriv"
@@ -4017,219 +4027,219 @@ msgstr ""
 "Fel lösenfras! Försök igen...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Öppnar fönster för kontoinställningar...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Inställningar för nytt konto"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Kontoinställningar"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Skapar fönster för kontoinställningar...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Ta emot"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Integritet"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Detta kontos namn"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "Använd som förvalt konto"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Personlig information"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Fullst. namn"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "E-postadress"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Serverinformation"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "Diskussionsgrupper (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Inget (lokalt)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Denna server kräver autentisering"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "Diskussionsgruppsserver"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Server för mottagning"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "Server att skicka med (SMTP)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "Användar-ID"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Lösenord"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 msgid "Use secure authentication (APOP)"
 msgstr "Använd säker autentisering (APOP)"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Ta bort meddelanden på server när de mottagits"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Ta bort efter"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "dagar"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dagar: ta bort direkt)"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Hämta alla meddelanden från server"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Gräns för mottagningsstorlek"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Filtrera meddelanden vid mottagning"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Förvald inkorg"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Ofiltrerade meddelanden kommer att lagras i denna mapp"
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Autentiseringsmetod"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "Bara vid manuell mottagning"
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "Diskussionsgrupper"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 msgid "Maximum number of articles to download"
 msgstr "Maximalt antal inlägg att hämta"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 msgid "No limit if 0 is specified."
 msgstr "Ingen begränsning om 0 är angivet."
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "\"Hämta allt\" hämtar post på detta konto"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Brevhuvud"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Lägg till datumfält i brevhuvud"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Skapa Meddelande-ID"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Lägg till användardefinierat brevhuvud"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr "Redigera..."
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-Autentisering (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4241,191 +4251,191 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentisera med POP3 innan brev skickas"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 msgid "Command output"
 msgstr "Kommandoutdata"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Sätt automatiskt följande adresser"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Kopia"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Dold kopia"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Svara till"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Signera alla meddelanden"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Kryptera alla meddelanden"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr "Kryptera vid svar på krypterat meddelande"
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "Använd ASCII-pansar för kryptering"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Använd klartextsignatur"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Signaturnyckel"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Använd förvald GnuPG-nyckel"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Välj nyckel genom din e-postadress"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Ange nyckel manuellt"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "Användar- eller nyckel-ID:"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "Använd inte SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "Använd SSL för POP3-förbindelse"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Använd STARTTLS-kommando för att starta SSL-session"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "Använd SSL för IMAP4-förbindelse"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "Använd SSL för NNTP-förbindelse"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Skicka (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "Använd SSL för SMTP-förbindelse"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr "Använd icke-blockerande SSL"
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Slå av detta om du har problem med SSL-förbindelsen"
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "Ange SMTP-port"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "Ange POP3-port"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "Ange IMAP4-port"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "Ange NNTP-port"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Ange domännamn"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "IMAP-servermapp"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Hämta alla meddelanden från server"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Lägg skickade meddelanden i"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Lägg utkast i"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Lägg borttagna meddelanden i"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Lägg borttagna meddelanden i"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "Kontonamn har inte angivits."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "E-postadress har inte angivits."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "SMTP-server har inte angivits."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "Användar-ID har inte angivits."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "POP3-server har inte angivits."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4-server har inte angivits."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "NNTP-server har inte angivits."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6006,84 +6016,84 @@ msgstr ""
 "med säkerhet att den kommer att gå till den person du avser.\n"
 "Litar du på den tillräckligt för att använda den ändå?"
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "Brevhuvud i köat meddelande är trasigt.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Skickar meddelande med kommando: %s\n"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Kan inte köra kommando: %s"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Fel uppstod vid körning av kommando: %s"
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Upprättar förbindelse"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Upprättar förbindelse med SMTP-server: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "Skickar HELO..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "Autentiserar"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 msgid "Sending message..."
 msgstr "Skickar meddelande..."
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "Skickar EHLO..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Skickar MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Skickar"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Skickar RCPT TO..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Skickar DATA..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Avslutar..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Skickar meddelande (%d / %d byte)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "Fel uppstod när meddelandet skickades."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/tr.po b/po/tr.po
index 464b3f8f..09b652f0 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+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"
@@ -692,7 +692,7 @@ msgstr ""
 msgid "Name"
 msgstr "İsim"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -1157,7 +1157,7 @@ msgid "Group"
 msgstr "Grup"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Dizin"
@@ -1190,7 +1190,7 @@ msgstr "Not"
 msgid "Warning"
 msgstr "Uyarı"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Hata"
 
@@ -1633,7 +1633,7 @@ msgstr ""
 "İletinin gönderileceği hesap belirtilmedi.\n"
 "Lütfen göndermeden önce bir e-posta hesabı girin."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "İleti, %s adresine gönderilirken bir hata oluştu."
@@ -1738,7 +1738,7 @@ msgstr "MIME türü"
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Gönder"
@@ -1780,7 +1780,7 @@ msgid "Attach file"
 msgstr "Dosya ekle"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "İmza"
@@ -1994,7 +1994,7 @@ msgid " Check File "
 msgstr " Dosyayı Denetle "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Dosya"
 
@@ -2073,7 +2073,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot Girdisini Düzenle"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2138,7 +2138,7 @@ msgstr "Zaman aşımı (sn) "
 msgid "Maximum Entries"
 msgstr "Azami Girdi Sayısı"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Temel"
 
@@ -2195,7 +2195,7 @@ msgid "Exporting file:"
 msgstr "Dosya aktarılıyor:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr " Seç... "
 
@@ -2648,133 +2648,143 @@ msgstr "Bitir"
 msgid "Sylpheed: %d new messages"
 msgstr "Tamamlandı (%d yeni mesaj)"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr " Kimlik denetimi"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Yeni iletiler alınıyor"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "Bekle"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "İptal edildi"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Alınıyor"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Tamamlandı (%d mesaj, (%s) alındı)"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "Tamamlandı (Yeni ileti yok)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Bağlantıda hata"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Kimlik denetiminde hata"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Kilitli"
 
-#: src/inc.c:596
+#: src/inc.c:635
 msgid "Timeout"
 msgstr "Zaman aşımı"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Tamamlandı (%d yeni mesaj)"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Tamamlandı (yeni mesaj yok)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr " İletiler alınırken bazı hatalar oluştu."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s hesabındaki yeni iletiler alınıyor...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr " Kimlik denetimi"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Yeni iletiler alınıyor"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3 sunucusuna bağlantı kuruluyor: %s ..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3 sunucuya bağlantı kurulamadı: %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Kimlik denetimi yapılıyor..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s konumundan iletiler alınıyor..."
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Yeni ileti numaraları alınıyor (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Yeni ileti numaraları alınıyor (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Yeni ileti numaraları alınıyor (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "İletilerin boyutları alınıyor (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d. ileti siliniyor"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Çıkılıyor"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "İletiler alınıyor (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Alınıyor (%d mesaj, (%s) alındı)"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 msgid "Connection failed."
 msgstr "Bağlantıda hata oluştu."
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "İletiler işlenirken bir hata oluştu."
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2783,28 +2793,28 @@ msgstr ""
 "E-posta işlenirken hata oluştu:\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Yeterli disk alanı kalmadı."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "Dosyaya yazılamadı."
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "protokol hatası"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr "Bağlantı karşı taraftan kesildi."
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "Posta kutusu kilitli"
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2813,11 +2823,11 @@ msgstr ""
 "Posta kutusu kilitli:\n"
 "%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 msgid "Authentication failed."
 msgstr "Yetkilendirmede hata oluştu."
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2826,15 +2836,15 @@ msgstr ""
 "Yetkilendirme başarısız:\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr "Oturum zaman aşımına uğradı."
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "İptal edildi\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s'den yeni mesajlar %s e alınıyor...\n"
@@ -3721,7 +3731,7 @@ msgstr "Tüm hesaplardaki postaları dağıt"
 msgid "Send queued message(s)"
 msgstr "Kuyruktaki iletileri gönder"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Düzenle"
@@ -4062,224 +4072,224 @@ msgstr ""
 "Hatalı parola! Yeniden deneyin...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Hesap tercihleri penceresi açılıyor...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Hesap%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Yeni hesap için tercihler"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Hesap tercihleri"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Hesap tercihleri penceresi oluşturuluyor...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Al"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Gizlilik"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Bu hesabın adı"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "Öntanımlı kullan"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Kişisel bilgiler"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Tam adı"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "E-Posta adresi"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Kurum"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Sunucu bilgisi"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "Haber grubu (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Hiçbiri (yerel)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Bu sunucu parola istiyor"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "Haber grubu sunucusu"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "İletilerin alınacağı sunucu"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "Gönderme için SMTP sunucu"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "Kullanıcı adı"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Parola"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 msgid "Use secure authentication (APOP)"
 msgstr "Güvenli yetkilendirme kullan (APOP)"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "İleti alındığı zaman sunucudaki kopyasını sil"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Postayı"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "gün sonra sil"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 gün: hemen sil)"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Sunucudaki tüm iletileri indir"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Alınan ileti boyutu sınırı"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "İletileri alırken filtrele"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Öntanımlı gelen kutusu"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Filtrelenmemiş iletiler bu kutuda bekleyecektir)"
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Kimlik denetim yöntemi"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "Sadece kullanıcı kendi aldığında"
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "Haberler"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Indirilebilecek azami makale sayısı\n"
 "(0 => limitsiz)"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Alıcı belirtilmedi."
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "'Hepsini Al' seçeneği bu hesaptaki yeni postaları da kontrol etsin"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Başlık"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Tarih başlığını ekle"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "İleti Numarası Oluştur"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Kullanıcı tanımlı başlık ekle"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " Düzenle... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Kimlik denetimi"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Kimlik Denetimi (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4292,192 +4302,192 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Göndermeden önce POP3 ile kimlik denetimi yap"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 msgid "Command output"
 msgstr "Komut çıktısı"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Aşağıdaki adresleri otomatik olarak tanımla"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Yanıtla"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "İletileri öntanımlı olarak imzala"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "İletileri öntanımlı olarak şifrele"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "ASCII formatında şifrele"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Metin formatlı imza ekle"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "İmza anahtarı"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Öntanımlı GnuPG anahtarını kullan"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Anahtarı e-posta adresine göre seç"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Anahtarı elle seç"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "Kullanıcı ya da anahtar numarası:"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "SSL kullanma"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "POP3 bağlantısı için SSL kullan"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "SSL oturumuna başlamak için STARTSSL komutunu kullan"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "IMAP4 bağlantısı için SSL kullan"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "NNTP bağlantısı için SSL kullan"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Gönder (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "SMTP bağlantısı için SSL kullan"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr "Bloklanmamış SSL Kullan"
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(SSL bağlantısında sorunlar yaşıyorsanız, bu özelliği kapatın)"
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "SMTP portu belirt"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "POP3 portu belirt"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "IMAP4 portu belirt"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "NNTP portu belirt"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Alan adı belirt"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "IMAP sunucu dizini"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Sunucudaki tüm iletileri indir"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Gönderilen iletileri nerede sakla"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Taslak mesajlarını buraya koy"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Silinen mesajları buraya koy"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Silinen mesajları buraya koy"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "Hesap adı girilmemiş."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "İleti adresi girilmemiş."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "SMTP sunucu girilmemiş."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "Kullanıcı numarası girilmemiş."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "POP3 sunucu girilmemiş."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 sunucu girilmemiş."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "NNTP sunucu girilmemiş."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6077,84 +6087,84 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "Alıntı metinindeki başlıklar hatalı.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "İleti gönderiliyor (%d / %d bayt)"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Komut çalıştır"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Komut gönderilirken hata oluştu\n"
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Bağlantı kuruluyor"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "SMTP sunucuya bağlantı kuruluyor: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "HELO gönderiliyor..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr " Kimlik denetimi"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 msgid "Sending message..."
 msgstr "İleti gönderiliyor..."
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "EHLO gönderiliyor... "
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM gönderiliyor..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Gönderiliyor"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO gönderiliyor..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "DATA gönderiliyor..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Çıkılıyor..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "İleti gönderiliyor (%d / %d bayt)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "İleti gönderiliyor"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "İleti gönderilirken hata oluştu."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/uk.po b/po/uk.po
index 8e235241..96793b79 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.2.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+0900\n"
 "PO-Revision-Date: 2006-04-13 00:34+0300\n"
 "Last-Translator: O.R. Nykyforchyn <nick@pu.if.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -699,7 +699,7 @@ msgstr ""
 msgid "Name"
 msgstr "Ім'я"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Протокол"
 
@@ -1154,7 +1154,7 @@ msgid "Group"
 msgstr "Група"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Папка"
@@ -1187,7 +1187,7 @@ msgstr "Примітка"
 msgid "Warning"
 msgstr "Попередження"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Помилка"
 
@@ -1600,7 +1600,7 @@ msgstr ""
 "Обліковий запис для відсилання пошти не вказано.\n"
 "Оберіть, будь-ласка, запис перед відправкою."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Трапилась помилка при відсиланні листа до %s ."
@@ -1706,7 +1706,7 @@ msgstr "тип MIME"
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Послати"
@@ -1748,7 +1748,7 @@ msgid "Attach file"
 msgstr "Приєднати файл"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Підпис"
@@ -1955,7 +1955,7 @@ msgid " Check File "
 msgstr " Перевірити файл "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Файл"
 
@@ -2033,7 +2033,7 @@ msgid "Edit JPilot Entry"
 msgstr "Редагувати запис JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2098,7 +2098,7 @@ msgstr "Таймаут (с)"
 msgid "Maximum Entries"
 msgstr "Максимальний розмір результату"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Основні"
 
@@ -2155,7 +2155,7 @@ msgid "Exporting file:"
 msgstr "Експорт файла:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr " Обрати... "
 
@@ -2605,133 +2605,143 @@ msgstr "Закінчити"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d нових листів"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Аутентифікація"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Отримання нових листів"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "Очікування"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Скасовано"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Отримання"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Виконано (%d лист(ів) (%s) отримано)"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "Виконано (немає нових листів)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Невдача з'єднання"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Невдача автентифікації"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Заблоковано"
 
-#: src/inc.c:596
+#: src/inc.c:635
 msgid "Timeout"
 msgstr "Таймаут"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Закінчено (%d нових листів)"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Закінчено (немає нових листів)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "При отриманні пошти трапились деякі помилки."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "отримання нової пошти для запису %s...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Аутентифікація"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Отримання нових листів"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "З'єднуємось з сервером POP3: %s ..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не вдалось з'єднатись з сервером POP3: %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Автентифікація..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Отримуємо листи від %s..."
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Отримуємо кількість нових листів (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Отримуємо кількість нових листів (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Отримуємо кількість нових листів (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Отримуємо розмір листів (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "Видаляємо лист %d"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Виходимо"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Отримуємо лист (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Отримуємо лист (%d лист(ів) (%s) отримано)"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 msgid "Connection failed."
 msgstr "Невдача з'єднання."
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "При обробці пошти трапилась помилка."
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2740,28 +2750,28 @@ msgstr ""
 "При обробці пошти трапилась помилка:\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Немає вільного місця на диску."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "Не вдалось писати в файл."
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "Помилка сокета."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr "З'єднання закрито віддаленим хостом."
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "Скриньку заблоковано."
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2770,11 +2780,11 @@ msgstr ""
 "Скриньку заблоковано:\n"
 "%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 msgid "Authentication failed."
 msgstr "Невдача аутентифікації."
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2783,15 +2793,15 @@ msgstr ""
 "Невдача аутентифікації:\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr "Таймаут сесії."
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "Включення скасовано\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Отримуємо нові листи від %s в %s...\n"
@@ -3664,7 +3674,7 @@ msgstr "Отримати нові листи для всіх записів"
 msgid "Send queued message(s)"
 msgstr "Відіслати лист(и) з черги"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Створення листа"
@@ -4023,217 +4033,217 @@ msgstr ""
 "Поганий пароль! Пробуємо знову...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Відкриття вікна опцій account'а...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Запис%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Налаштування для нового запису"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Налаштування запису"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Створення вікна опцій запису...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Отримання"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Advanced"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Назва цього запису"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "Встановити як default"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Особиста інформація"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Повне ім'я"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "Поштова адреса"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Організація"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Інформація про сервер"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "Новини (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Нема (локально)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Цей сервер вимагає аутентифікації"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "Сервер новин"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Сервер для отримання"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "Сервер SMTP (відсилання)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "ID користувача"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Пароль"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 msgid "Use secure authentication (APOP)"
 msgstr "Вживати безпечну аутентифікацію (APOP)"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Видаляти листи на сервері після отримання"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Видалити через"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "днів"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 msgid "0 days: remove immediately"
 msgstr "0 днів - видаляти негайно"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Завантажити всі листи на сервері"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Обмеження розміру отриманих листів"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "Кб"
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Фільтрувати листи при отриманні"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Вхідна папка за замовчуванням"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "У цій папці складаємо невідфільтровані листи."
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Метод аутентифікації"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 msgid "Only check INBOX on receiving"
 msgstr "При отриманні тільки перевіряти INBOX"
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "Новини"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 msgid "Maximum number of articles to download"
 msgstr "Максимальна кількість статей для завантаження"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 msgid "No limit if 0 is specified."
 msgstr "Без обмежень, якщо вказано 0."
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "Перевіряти за командою `Отримати всі'"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Заголовок"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Додати поле дати заголовка"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Генерувати Message-ID"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Вживати заголовок, визначений користувачем"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " Редагувати... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Аутентифікація"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Аутентифікація SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4245,189 +4255,189 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Аутентифікація POP3 перед відсиланням"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 msgid "Command output"
 msgstr "Вивід команди"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Автоматично встановлювати наступні адреси"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Копія"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Приховано"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Зворотня адреса"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Підписувати лист за замовчуванням"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Шифрувати лист за замовчуванням"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr "Помилка при відповіді на шифрований лист"
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "Вживати \"ASCII-armored\" формат для шифрування"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Вживати підпис відкритим текстом"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Ключ підпису"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Вживати ключ GnuPG за замовчуванням"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Обрати ключ за Вашою адресою e-mail"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Визначити ключ власноручно"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "Користувач або ідентифікатор ключа:"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "Не вживати SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "Вживати SSL для з'єднання POP3"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Вживати команду STARTTLS для початку сесії SSL"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "Вживати SSL для з'єднання IMAP4"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "Вживати SSL для з'єднання NNTP"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Відсилка (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "Вживати SSL для з'єднання SMTP"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr "Вживати неблокуючий SSL"
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Вимкніть це, якщо стикаєтесь з проблемами при з'єднанні SSL."
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "Вказати порт SMTP"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "Вказати порт POP3"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "Вказати порт IMAP4"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "Вказати порт NNTP"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Вказати ім'я домена"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "Каталог сервера IMAP"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Буде показано тільки підпапки цього каталога."
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 msgid "Clear all message caches on exit"
 msgstr "При виході очищати всі кеші повідомлень"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Зберігати відіслані листи в"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Зберігати чернетки листів в"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 msgid "Put queued messages in"
 msgstr "Зберігати видалені листи в"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Зберігати видалені листи в"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "Назву запису не вказано."
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "Не вказано поштову адресу."
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "Не вказано сервер SMTP."
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "Не вказано ID користувача."
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "Не вказано сервер POP3."
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "Не вказано сервер IMAP4."
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "Не вказано сервер NNTP."
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr "Вказана папка не є папкою черги."
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5985,84 +5995,84 @@ msgstr ""
 "напевно, що він потрапить до відповідної людини.\n"
 "Все ж вживати? "
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "Заголовок листа з черги зіпсовано.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Посилаємо лист з допомогою команди: %s\n"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Не вдалось виконати команду: %s"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "При виконанні команди '%s' трапилась помилка"
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "З'єднуємось"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "З'єднання з сервером SMTP: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "Посилаємо HELO..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "Аутентифікація"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 msgid "Sending message..."
 msgstr "Посилаємо лист..."
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "Посилаємо EHLO..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Посилаємо MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Посилаємо"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Посилаємо RCPT TO..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Посилаємо DATA..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Виходимо..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Посилаємо лист (%d / %d байтів)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Посилаємо лист"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "При відсиланні листа трапилась помилка."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/vi.po b/po/vi.po
index dbe7b869..e5dc9c03 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+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"
@@ -676,7 +676,7 @@ msgstr ""
 msgid "Name"
 msgstr "Tên"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "Giao thức"
 
@@ -1135,7 +1135,7 @@ msgid "Group"
 msgstr "Nhóm"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Thư mục"
@@ -1168,7 +1168,7 @@ msgstr "Chú ý"
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "Lỗi"
 
@@ -1581,7 +1581,7 @@ msgstr ""
 "Chưa xác định tài khoản để gửi thư.\n"
 "Hãy chọn một tài khoản trước khi gửi."
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Xảy ra lỗi khi gửi thư đến %s ."
@@ -1687,7 +1687,7 @@ msgstr "Kiểu MIME"
 msgid "Size"
 msgstr "Kích thước"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "Gửi"
@@ -1729,7 +1729,7 @@ msgid "Attach file"
 msgstr "Đính kèm tập tin"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "Chữ kí"
@@ -1936,7 +1936,7 @@ msgid " Check File "
 msgstr " Kiểm tra tập tin "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "Tập tin"
 
@@ -2014,7 +2014,7 @@ msgid "Edit JPilot Entry"
 msgstr "Soạn mục JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2079,7 +2079,7 @@ msgstr "Hết hạn (giây)"
 msgid "Maximum Entries"
 msgstr "Số mục tối đa"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "Cơ bản"
 
@@ -2136,7 +2136,7 @@ msgid "Exporting file:"
 msgstr "Đang xuất tập tin:"
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr "Chọn... "
 
@@ -2586,133 +2586,143 @@ msgstr "Hoàn thành"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d thư mới"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "Đang xác thực"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "Đang tải về thư mới"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "Đợi"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "Đã bị huỷ bỏ"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "Đang tải về"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Xong (%d thư (%s) nhận được)"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "Xong (không có thư mới)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "Kết nối thất bại"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "Xác thực thất bại"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "Đã khoá"
 
-#: src/inc.c:596
+#: src/inc.c:635
 msgid "Timeout"
 msgstr "Hết giờ"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Hoàn tất (%d thư mới)"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "Hoàn tất (không có thư mới)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "Xảy ra một số lỗi khi nhận thư."
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "đang nhận thư mới của tài khoản %s...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "Đang xác thực"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Đang nhận thư mới"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Đang kết nối tới máy chủ POP3: %s..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Không thể kết nối tới máy thủ POP3: %s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Đang xác thực..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Đang lấy thư trên %s..."
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Đang xác định số lượng thư mới (STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Đang xác định số lượng thư mới (LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Đang xác định số lượng thư mới (UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "Đang xác định kích thước thư (LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "Đang xoá thư %d"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "Đang thoát"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Đang lấy thư (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Đang lấy về (đã nhận %d thư (%s))"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 msgid "Connection failed."
 msgstr "Kết nối thất bại."
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "Có lỗi khi xử lí thư."
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2721,28 +2731,28 @@ msgstr ""
 "Có lỗi khi xử lí thư:\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "Ổ cứng bị đầy."
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "Không thể ghi lên tập tin"
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "Lỗi socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr "Kết nối bị ngắt bởi máy từ xa."
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "Hộp thư bị khoá."
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2751,11 +2761,11 @@ msgstr ""
 "Hộp thư bị khoá:\n"
 "%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 msgid "Authentication failed."
 msgstr "Xác thực thất bại."
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2764,15 +2774,15 @@ msgstr ""
 "Xác thực thất bại:\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr "Phiên làm việc hết giờ."
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "Sáp nhập bị huỷ bỏ\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Đang lấy thư từ %s vào %s...\n"
@@ -3644,7 +3654,7 @@ msgstr "Sáp nhật thư mới của mọi tài khoản"
 msgid "Send queued message(s)"
 msgstr "Gửi thư đang đợi"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Viết thư"
@@ -4003,217 +4013,217 @@ msgstr ""
 "Mật khẩu sai! Thử lại...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "Đang mở cửa sổ cấu hình tài khoản...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "Tài khoản %d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "Cấu hình cho tài khoản mới"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "Cấu hình tài khoản"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "Đang tạo của sổ cấu hình tài khoản...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "Nhận"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "Riêng tư"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "Nâng cao"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "Tên của tài khoản này"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "Đặt là mặc định"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "Thông tin cá nhân"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "Tên đầy đủ"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "Địa chỉ thư"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "Tổ chức"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "Thông tin máy chủ"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "Tin tức (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "Không (nội bộ)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "Máy chủ này yêu cầu xác thực"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "Máy chủ tin tức"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "Máy chủ nhận"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "Máy chủ SMTP (gửi)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "ID người dùng"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 msgid "Use secure authentication (APOP)"
 msgstr "Dùng xác thực bảo mật (APOP)"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "Xoá thư khỏi máy chủ sau khi nhận"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "Xoá sau"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "ngày"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 msgid "0 days: remove immediately"
 msgstr "0 ngày: xoá ngay lập tức"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "Tải mọi thư trên máy chủ"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "Giới hạn kích thước khi nhận"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "Lọc thư khi nhận"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "Hộp nhận mặc định"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Thư chưa lọc sẽ được lưu vào thư mục này."
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "Phương thức xác thực"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "Tự động"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 msgid "Only check INBOX on receiving"
 msgstr "Chỉ kiểm tra Hộp nhận khi nhận"
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "Tin tức"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 msgid "Maximum number of articles to download"
 msgstr "Số bài tải về tối đa"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 msgid "No limit if 0 is specified."
 msgstr "Không giới hạn nếu ghi là 0"
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Lấy tất' sẽ kiểm tra các thư mới của tài khoản này"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Header"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "Thêm trường Ngày tháng cho header"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "Tạo ID của thư"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "Thêm header theo định nghĩa người dùng"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " Soạn... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "Xác thực"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Xác thực SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4225,189 +4235,189 @@ msgstr ""
 msgid "Authenticate with POP3 before sending"
 msgstr "Xác thực với POP3 trước khi gửi"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 msgid "Command output"
 msgstr "Đầu ra của lệnh"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Tự động đặt địa chỉ sau"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "Hồi âm cho"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "Kí tên theo mặc định"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "Mã hoá thư theo mặc định"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr "Mã hoá khi trả lời thư mã hoá"
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "Dùng định dạng ASCII-armored để mã hoá"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "Dùng chữ kí là văn bản thuần tuý"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "Khoá của chữ kí"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "Dùng khoá GnuPG mặc định"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "Chọn khoá theo địa chỉ thư của bạn"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "Chỉ định khoá theo cách thủ công"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "Người dùng hoặc ID của khoá:"
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "Không dùng SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "Dùng SSL cho kết nối POP3"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Dùng lệnh STARTTLS để khởi động phiên SSL"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "Dùng SSL cho kết nối IMAP4"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "Dùng SSL cho kết nối NNTP"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "Gửi (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "Dùng SSL cho kết nối SMTP"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr "Dùng SSL dạng không chặn"
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Tắt nếu bạn có vấn đề với kết nối SSL."
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "Chỉ định cổng STMP"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "Chỉ định cổng POP3"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "Chỉ định cổng IMAP4"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "Chỉ định cổng NNTP"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "Chỉ định tên miền"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "Thư mục máy chủ IMAP"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 msgid "Clear all message caches on exit"
 msgstr "Xoá mọi thư trên bộ nhớ đệm khi thoát"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "Chuyển thư đã gửi vào"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "Chuyển thư nháp vào"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 msgid "Put queued messages in"
 msgstr "Chuyển thư đang đợi gửi vào"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "Chuyển thư đã xoá vào"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "Tên tài khoản chưa được nhập"
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "Địa chỉ thư chưa được nhập"
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "Máy chủ SMTP chưa được nhập"
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "ID người dùng chưa được nhập"
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "Máy chủ POP3 chưa được nhập"
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "Máy chủ IMAP4 chưa được nhập"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "Máy chủ NNTP chưa được nhập"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5963,84 +5973,84 @@ msgstr ""
 "nó sẽ đến được đúng với người mà bạn muốn.\n"
 "Bạn có đủ tin tưởng để dùng nó không?"
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "Header của thư đang đợi gửi đã bị hỏng.\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Đang gửi thư với lệnh: %s\n"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Không chạy được lệnh: %s"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Có lỗi khi chạy lệnh: %s"
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "Đang kết nối"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Đang kết nối tới máy chủ SMTP: %s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "Đang gửi HELO..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "Đang xác thực"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 msgid "Sending message..."
 msgstr "Đang gửi thư..."
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "Đang gửi EHLO..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "Đang gửi MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "Đang gửi"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "Đang gửi RCPT TO..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "Đang gửi DATA..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "Đang thoát..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Đang gửi thư (%d / %d byte)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "Đang gửi thư"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "Có lỗi khi gửi thư."
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7b2c15ba..a1e130a3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+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"
@@ -686,7 +686,7 @@ msgstr ""
 msgid "Name"
 msgstr "名称"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "协议"
 
@@ -1143,7 +1143,7 @@ msgid "Group"
 msgstr "群组"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "文件夹"
@@ -1176,7 +1176,7 @@ msgstr "注意"
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "错误"
 
@@ -1598,7 +1598,7 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
@@ -1702,7 +1702,7 @@ msgstr "MIME 类型"
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "发送"
@@ -1744,7 +1744,7 @@ msgid "Attach file"
 msgstr "加入附件"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "签名"
@@ -1957,7 +1957,7 @@ msgid " Check File "
 msgstr " 检查文件 "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "文件"
 
@@ -2035,7 +2035,7 @@ msgid "Edit JPilot Entry"
 msgstr "编辑 JPilot 项"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr " ... "
@@ -2100,7 +2100,7 @@ msgstr "超时(秒)"
 msgid "Maximum Entries"
 msgstr "最大项数"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "基本"
 
@@ -2157,7 +2157,7 @@ msgid "Exporting file:"
 msgstr "导出文件："
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr " 选择... "
 
@@ -2610,133 +2610,143 @@ msgstr "完成"
 msgid "Sylpheed: %d new messages"
 msgstr "完成 (%d 个新邮件)"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "正在验证"
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "正在获取新邮件"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "请等待"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "正在获取"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "完成 (收到 %d 个邮件 (%s))"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "完成 (没有新邮件)"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "验证失败"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "锁住"
 
-#: src/inc.c:596
+#: src/inc.c:635
 msgid "Timeout"
 msgstr "超时"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完成 (%d 个新邮件)"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "完成 (没有新邮件)"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "获取邮件时发生错误。"
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "正在获取帐号 %s 的新邮件...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "正在验证"
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s：正在获取新邮件"
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "正在连接POP3服务器：%s..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "无法连接POP3服务器：%s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "正在验证..."
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "正在从 %s 获取邮件..."
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "正在获取新邮件数量(STAT)..."
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "正在获取新邮件数量(LAST)..."
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "正在获取新邮件数量(UIDL)..."
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "正在获取新邮件的大小(LIST)..."
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "正在删除邮件 %d"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "正在退出"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "正在获取邮件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "正在获取 (收到 %d 个邮件 (%s))"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 msgid "Connection failed."
 msgstr "连接失败"
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "处理邮件时发生错误。"
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2745,28 +2755,28 @@ msgstr ""
 "处理邮件时发生错误：\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "没有剩余磁盘空间。"
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "无法写入文件。"
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "Socket错误。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr "远程主机关闭了连接。"
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "信箱被锁住。"
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2775,11 +2785,11 @@ msgstr ""
 "信箱被锁住：\n"
 "%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 msgid "Authentication failed."
 msgstr "验证失败。"
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2788,15 +2798,15 @@ msgstr ""
 "验证失败：\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr "会话超时。"
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "合并新邮件被取消\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "正在从 %s 获取新邮件到 %s...\n"
@@ -3674,7 +3684,7 @@ msgstr "合并所有帐号的新邮件"
 msgid "Send queued message(s)"
 msgstr "发送队列中的邮件"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "撰写"
@@ -4012,224 +4022,224 @@ msgstr ""
 "错误的口令串！重试...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "正在打开帐号首选项窗口...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "帐号%d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "新帐号的首选项"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "帐号首选项"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "正在创建帐号首选项窗口...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "接收"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "隐私"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "高级"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "帐号名称"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "设置为默认帐号"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "个人资料"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "全名"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "邮件地址"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "组织"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "服务器资料"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "新闻组 (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "无(本地)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "该服务器需要验证"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "新闻组服务器"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "接收服务器"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "SMTP服务器(发送)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "用户名"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "密码"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 msgid "Use secure authentication (APOP)"
 msgstr "使用安全验证 (APOP)"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "收到邮件后从服务器上删除"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "以后删除"
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "天"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 天：立即删除)"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "下载服务器上的所有邮件"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "接收大小限制"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "在接收邮件时进行过滤"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "默认收件箱"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(没有过滤的邮件会保存在该文件夹中)"
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "验证方法"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "自动"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "仅在手工接收时"
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "新闻"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "下载文章的最大数量\n"
 "(指定 0 表示无限制)"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "没有指定收件人。"
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "“全部接收”时检查该帐号的新邮件"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "邮件头"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "添加日期头域"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "生成邮件标识"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "添加用户定义的头域"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " 编辑... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "验证"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP验证(SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4239,192 +4249,192 @@ msgstr "如果您不填这些项，将使用和接收邮件相同的用户名和
 msgid "Authenticate with POP3 before sending"
 msgstr "发送前用POP3验证"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 msgid "Command output"
 msgstr "命令输出"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "自动设置以下地址"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "抄送"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "密件抄送"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "回复至"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "默认对邮件签名"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "默认对邮件加密"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "使用 ASCII 包裹格式进行加密"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "使用明文签名"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "签名密钥"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "使用默认的GnuPG密钥"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "按照邮件地址选择密钥"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "手工指定密钥"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "用户或者密钥ID："
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "不使用SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "使用SSL连接POP3服务器"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "使用STARTTLS命令开始SSL会话"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "使用SSL连接IMAP4服务器"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "使用SSL连接NNTP服务器"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "发送(SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "使用SSL连接SMTP服务器"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr "使用非阻塞式SSL"
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(如果您遇到SSL连接问题，请关闭该选项)"
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "指定SMTP端口"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "指定POP3端口"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "指定IMAP4端口"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "指定NNTP端口"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "指定域名"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "IMAP4 服务器目录"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "下载服务器上的所有邮件"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "将已发出的邮件保存于"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "将邮件草稿保存于"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "将删除的邮件保存于"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "将删除的邮件保存于"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "没有输入帐号名称。"
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "没有输入邮件地址。"
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "没有输入SMTP服务器。"
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "没有输入用户标识。"
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "没有输入POP3服务器。"
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "没有输入IMAP4服务器。"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "没有输入NNTP服务器。"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6014,84 +6024,84 @@ msgstr ""
 "的人那里。\n"
 "您仍然要使用它吗？"
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "队列中的邮件的邮件头头损坏。\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "正在发送邮件 (%d / %d 字节)"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "无法执行外部命令：%s\n"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "发送命令时发生错误\n"
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "正在连接"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "正在连接SMTP服务器：%s ..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "正在发送 HELO..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "正在验证"
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 msgid "Sending message..."
 msgstr "正在发送邮件..."
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "正在发送 EHLO..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "正在发送 MAIL FROM..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "正在发送"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "正在发送 RCPT TO..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "正在发送 DATA..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "正在退出..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "正在发送邮件 (%d / %d 字节)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "正在发送邮件"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "发送邮件时发生错误。"
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 56973a14..6fa295e3 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30 13:05+0900\n"
+"POT-Creation-Date: 2006-10-30 15:44+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"
@@ -691,7 +691,7 @@ msgstr ""
 msgid "Name"
 msgstr "名稱"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:658
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
 msgid "Protocol"
 msgstr "通訊協定"
 
@@ -1148,7 +1148,7 @@ msgid "Group"
 msgstr "群組"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:377 src/prefs_account_dialog.c:1693
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "資料夾"
@@ -1181,7 +1181,7 @@ msgstr "注意"
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:168 src/inc.c:593
+#: src/alertpanel.c:168 src/inc.c:632
 msgid "Error"
 msgstr "錯誤"
 
@@ -1599,7 +1599,7 @@ msgstr ""
 "您選用的帳號並非一個電子郵件帳號，可能是用來在新聞群組上發表文章用的。\n"
 "要發送郵件請選擇電子郵件帳號。"
 
-#: src/compose.c:2761 src/send_message.c:299
+#: src/compose.c:2761 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "向 %s 發出文章時出現錯誤。"
@@ -1704,7 +1704,7 @@ msgstr "MIME 型態"
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2366 src/prefs_account_dialog.c:529
 #: src/prefs_common_dialog.c:665
 msgid "Send"
 msgstr "送出"
@@ -1746,7 +1746,7 @@ msgid "Attach file"
 msgstr "附加檔案"
 
 #. signature
-#: src/compose.c:4848 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1207
 #: src/prefs_common_dialog.c:989
 msgid "Signature"
 msgstr "簽章"
@@ -1955,7 +1955,7 @@ msgid " Check File "
 msgstr " 檢查檔案 "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1218
 msgid "File"
 msgstr "檔案"
 
@@ -2033,7 +2033,7 @@ msgid "Edit JPilot Entry"
 msgstr "編輯 JPilot 資料"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1721
 #: src/prefs_common_dialog.c:1882
 msgid " ... "
 msgstr "..."
@@ -2098,7 +2098,7 @@ msgstr "逾時 (秒)"
 msgid "Maximum Entries"
 msgstr "項目最大值"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:524
+#: src/editldap.c:471 src/prefs_account_dialog.c:525
 msgid "Basic"
 msgstr "基本設定"
 
@@ -2155,7 +2155,7 @@ msgid "Exporting file:"
 msgstr "匯出檔名："
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:919
+#: src/prefs_account_dialog.c:920
 msgid " Select... "
 msgstr "選擇..."
 
@@ -2607,133 +2607,143 @@ msgstr "完成"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d 封新郵件"
 
-#: src/inc.c:373
+#: src/inc.c:386
+#, fuzzy
+msgid "Authenticating with POP3"
+msgstr "認證中..."
+
+#: src/inc.c:412
 msgid "Retrieving new messages"
 msgstr "取得新郵件中"
 
-#: src/inc.c:416
+#: src/inc.c:455
 msgid "Standby"
 msgstr "等待處理中"
 
-#: src/inc.c:550 src/inc.c:599
+#: src/inc.c:589 src/inc.c:638
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/inc.c:561
+#: src/inc.c:600
 msgid "Retrieving"
 msgstr "讀取中"
 
-#: src/inc.c:570
+#: src/inc.c:609
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "完成 （已接收 %d 封郵件 (%s)）"
 
-#: src/inc.c:574
+#: src/inc.c:613
 msgid "Done (no new messages)"
 msgstr "完成（無新郵件）"
 
-#: src/inc.c:580
+#: src/inc.c:619
 msgid "Connection failed"
 msgstr "連線失敗。"
 
-#: src/inc.c:583
+#: src/inc.c:622
 msgid "Auth failed"
 msgstr "認證失敗"
 
-#: src/inc.c:586
+#: src/inc.c:625
 msgid "Locked"
 msgstr "已鎖定"
 
-#: src/inc.c:596
+#: src/inc.c:635
 msgid "Timeout"
 msgstr "逾時"
 
-#: src/inc.c:646
+#: src/inc.c:685
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完成（%d 封新郵件）"
 
-#: src/inc.c:649
+#: src/inc.c:688
 msgid "Finished (no new messages)"
 msgstr "完成（無新郵件）"
 
-#: src/inc.c:658
+#: src/inc.c:697
 msgid "Some errors occurred while getting mail."
 msgstr "取得郵件時發生錯誤。"
 
-#: src/inc.c:694
+#: src/inc.c:733
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "取得 %s 的新郵件中, 請稍候...\n"
 
-#: src/inc.c:697
+#: src/inc.c:737
+#, fuzzy, c-format
+msgid "%s: Authenticating with POP3"
+msgstr "認證中..."
+
+#: src/inc.c:740
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 取得新郵件中, 請稍候..."
 
-#: src/inc.c:716
+#: src/inc.c:759
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "連線到 POP3 伺服器 %s 中..."
 
-#: src/inc.c:727
+#: src/inc.c:770
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "無法連線到 POP3 伺服器：%s:%d\n"
 
-#: src/inc.c:806 src/send_message.c:633
+#: src/inc.c:849 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "認證"
 
-#: src/inc.c:807
+#: src/inc.c:850
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "從 %s 中取得郵件中..."
 
-#: src/inc.c:812
+#: src/inc.c:855
 msgid "Getting the number of new messages (STAT)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:816
+#: src/inc.c:859
 msgid "Getting the number of new messages (LAST)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:820
+#: src/inc.c:863
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:824
+#: src/inc.c:867
 msgid "Getting the size of messages (LIST)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:834
+#: src/inc.c:877
 #, c-format
 msgid "Deleting message %d"
 msgstr "刪除第 %d 號郵件"
 
-#: src/inc.c:841 src/send_message.c:651
+#: src/inc.c:884 src/send_message.c:659
 msgid "Quitting"
 msgstr "離開"
 
-#: src/inc.c:866
+#: src/inc.c:909
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "取得新郵件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:887
+#: src/inc.c:930
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "取得新郵件 (共 %d 封新郵件, %s 已接收）"
 
-#: src/inc.c:1132
+#: src/inc.c:1175
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: src/inc.c:1138
+#: src/inc.c:1181
 msgid "Error occurred while processing mail."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/inc.c:1143
+#: src/inc.c:1186
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2742,39 +2752,39 @@ msgstr ""
 "處理郵件時發生錯誤：\n"
 "%s"
 
-#: src/inc.c:1149
+#: src/inc.c:1192
 msgid "No disk space left."
 msgstr "磁碟空間已滿。"
 
-#: src/inc.c:1154
+#: src/inc.c:1197
 msgid "Can't write file."
 msgstr "無法寫入檔案。"
 
-#: src/inc.c:1159
+#: src/inc.c:1202
 msgid "Socket error."
 msgstr "Socket 有錯誤"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1165 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1208 src/send_message.c:594 src/send_message.c:782
 msgid "Connection closed by the remote host."
 msgstr "遠端主機關閉連線。"
 
-#: src/inc.c:1171
+#: src/inc.c:1214
 msgid "Mailbox is locked."
 msgstr "信箱已被鎖定，可能前一次擷取未完成。"
 
-#: src/inc.c:1175
+#: src/inc.c:1218
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "信箱已被鎖定：%s"
 
-#: src/inc.c:1181 src/send_message.c:759
+#: src/inc.c:1224 src/send_message.c:767
 msgid "Authentication failed."
 msgstr "認證失敗"
 
-#: src/inc.c:1186 src/send_message.c:762
+#: src/inc.c:1229 src/send_message.c:770
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2783,15 +2793,15 @@ msgstr ""
 "認證失敗：\n"
 "%s"
 
-#: src/inc.c:1191 src/send_message.c:778
+#: src/inc.c:1234 src/send_message.c:786
 msgid "Session timed out."
 msgstr "作業逾時"
 
-#: src/inc.c:1227
+#: src/inc.c:1270
 msgid "Incorporation cancelled\n"
 msgstr "動作已取消\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1353
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "從 %s 中取得郵件放入 %s...\n"
@@ -3662,7 +3672,7 @@ msgstr "檢查所有帳號的新郵件"
 msgid "Send queued message(s)"
 msgstr "將暫存資料夾中的郵件送出"
 
-#: src/mainwindow.c:2377 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2377 src/prefs_account_dialog.c:531
 #: src/prefs_common_dialog.c:667 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "撰寫郵件"
@@ -4000,219 +4010,219 @@ msgstr ""
 "不當的密碼片語! 請再試一次...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:426
+#: src/prefs_account_dialog.c:427
 msgid "Opening account preferences window...\n"
 msgstr "開啟帳號設定的視窗...\n"
 
-#: src/prefs_account_dialog.c:459
+#: src/prefs_account_dialog.c:460
 #, c-format
 msgid "Account%d"
 msgstr "帳號 %d"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:479
 msgid "Preferences for new account"
 msgstr "新帳號設定"
 
-#: src/prefs_account_dialog.c:483
+#: src/prefs_account_dialog.c:484
 msgid "Account preferences"
 msgstr "帳號設定"
 
-#: src/prefs_account_dialog.c:506
+#: src/prefs_account_dialog.c:507
 msgid "Creating account preferences window...\n"
 msgstr "產生帳號設定的視窗...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:663
+#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:663
 msgid "Receive"
 msgstr "接收設定"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:674
+#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:674
 msgid "Privacy"
 msgstr "私人資料"
 
-#: src/prefs_account_dialog.c:537
+#: src/prefs_account_dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2155
+#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2155
 msgid "Advanced"
 msgstr "進階設定"
 
-#: src/prefs_account_dialog.c:589
+#: src/prefs_account_dialog.c:590
 msgid "Name of this account"
 msgstr "這個帳號的名稱"
 
-#: src/prefs_account_dialog.c:598
+#: src/prefs_account_dialog.c:599
 msgid "Set as default"
 msgstr "設為預設帳號"
 
-#: src/prefs_account_dialog.c:602
+#: src/prefs_account_dialog.c:603
 msgid "Personal information"
 msgstr "個人資訊"
 
-#: src/prefs_account_dialog.c:611
+#: src/prefs_account_dialog.c:612
 msgid "Full name"
 msgstr "全名"
 
-#: src/prefs_account_dialog.c:617
+#: src/prefs_account_dialog.c:618
 msgid "Mail address"
 msgstr "電子郵件地址"
 
-#: src/prefs_account_dialog.c:623
+#: src/prefs_account_dialog.c:624
 msgid "Organization"
 msgstr "服務公司/組織"
 
-#: src/prefs_account_dialog.c:647
+#: src/prefs_account_dialog.c:648
 msgid "Server information"
 msgstr "伺服器資訊"
 
-#: src/prefs_account_dialog.c:668 src/prefs_account_dialog.c:824
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
+#: src/prefs_account_dialog.c:1466
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:670 src/prefs_account_dialog.c:932
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
+#: src/prefs_account_dialog.c:1483 src/prefs_account_dialog.c:1665
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:672
+#: src/prefs_account_dialog.c:673
 msgid "News (NNTP)"
 msgstr "新聞 (NNTP)"
 
-#: src/prefs_account_dialog.c:674
+#: src/prefs_account_dialog.c:675
 msgid "None (local)"
 msgstr "無 (local)"
 
-#: src/prefs_account_dialog.c:687
+#: src/prefs_account_dialog.c:688
 msgid "This server requires authentication"
 msgstr "這個伺服器需要認證"
 
-#: src/prefs_account_dialog.c:726
+#: src/prefs_account_dialog.c:727
 msgid "News server"
 msgstr "新聞伺服器"
 
-#: src/prefs_account_dialog.c:732
+#: src/prefs_account_dialog.c:733
 msgid "Server for receiving"
 msgstr "接收郵件伺服器"
 
-#: src/prefs_account_dialog.c:738
+#: src/prefs_account_dialog.c:739
 msgid "SMTP server (send)"
 msgstr "SMTP 郵件伺服器 (發信)"
 
-#: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1129
+#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
 msgid "User ID"
 msgstr "帳號"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1138
+#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
 msgid "Password"
 msgstr "密碼"
 
-#: src/prefs_account_dialog.c:832
+#: src/prefs_account_dialog.c:833
 msgid "Use secure authentication (APOP)"
 msgstr "使用安全認證（APOP）"
 
-#: src/prefs_account_dialog.c:835
+#: src/prefs_account_dialog.c:836
 msgid "Remove messages on server when received"
 msgstr "接收郵件時一併從伺服器上移除。"
 
-#: src/prefs_account_dialog.c:846
+#: src/prefs_account_dialog.c:847
 msgid "Remove after"
 msgstr "在幾天後移除："
 
-#: src/prefs_account_dialog.c:855
+#: src/prefs_account_dialog.c:856
 msgid "days"
 msgstr "天"
 
-#: src/prefs_account_dialog.c:872
+#: src/prefs_account_dialog.c:873
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(設為 0 則為立即移除)"
 
-#: src/prefs_account_dialog.c:882
+#: src/prefs_account_dialog.c:883
 msgid "Download all messages on server"
 msgstr "接收伺服器上所有的郵件。"
 
-#: src/prefs_account_dialog.c:888
+#: src/prefs_account_dialog.c:889
 msgid "Receive size limit"
 msgstr "接收郵件大小限制"
 
-#: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:902
+#: src/prefs_account_dialog.c:903
 msgid "Filter messages on receiving"
 msgstr "接收郵件時進行過濾"
 
-#: src/prefs_account_dialog.c:910
+#: src/prefs_account_dialog.c:911
 msgid "Default inbox"
 msgstr "預設的收件夾"
 
-#: src/prefs_account_dialog.c:930
+#: src/prefs_account_dialog.c:931
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "未經過濾的郵件將會被存到這個資料夾中。"
 
-#: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1099
+#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
 msgid "Authentication method"
 msgstr "認證方法"
 
-#: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1109
+#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
 #: src/prefs_common_dialog.c:881 src/prefs_common_dialog.c:2525
 msgid "Automatic"
 msgstr "自動"
 
-#: src/prefs_account_dialog.c:961
+#: src/prefs_account_dialog.c:962
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "只在手動收取郵件時顯示"
 
-#: src/prefs_account_dialog.c:963
+#: src/prefs_account_dialog.c:964
 msgid "News"
 msgstr "新聞"
 
-#: src/prefs_account_dialog.c:975
+#: src/prefs_account_dialog.c:976
 msgid "Maximum number of articles to download"
 msgstr "一次最多下載文章數量"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:993
 msgid "No limit if 0 is specified."
 msgstr "設為 0 則不限制數量。"
 
-#: src/prefs_account_dialog.c:996
+#: src/prefs_account_dialog.c:997
 msgid "`Get all' checks for new messages on this account"
 msgstr "「全部檢查」時檢查這個帳號的新郵件"
 
-#: src/prefs_account_dialog.c:1049 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "郵件標頭設定"
 
-#: src/prefs_account_dialog.c:1056
+#: src/prefs_account_dialog.c:1057
 msgid "Add Date header field"
 msgstr "加入日期"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1058
 msgid "Generate Message-ID"
 msgstr "產生郵件識別碼"
 
-#: src/prefs_account_dialog.c:1064
+#: src/prefs_account_dialog.c:1065
 msgid "Add user-defined header"
 msgstr "加入使用者定義的標頭"
 
-#: src/prefs_account_dialog.c:1066 src/prefs_common_dialog.c:1585
+#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1585
 #: src/prefs_common_dialog.c:1612
 msgid " Edit... "
 msgstr " 編輯... "
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1077
 msgid "Authentication"
 msgstr "認證"
 
-#: src/prefs_account_dialog.c:1084
+#: src/prefs_account_dialog.c:1085
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP 認證 (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1160
+#: src/prefs_account_dialog.c:1161
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4222,191 +4232,191 @@ msgstr "若是此欄空白，將使用接收時的帳號與密碼。"
 msgid "Authenticate with POP3 before sending"
 msgstr "送信前先做 POP3 認證"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1226
 msgid "Command output"
 msgstr "命令輸出"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1237 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "在相關欄位上自動加入下列電子郵件信箱："
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1246
 msgid "Cc"
 msgstr "複本"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1259
 msgid "Bcc"
 msgstr "密件複本"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1272
 msgid "Reply-To"
 msgstr "回信地址"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1325
 msgid "Sign message by default"
 msgstr "郵件自動做數位簽章"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1327
 msgid "Encrypt message by default"
 msgstr "郵件自動加密"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1329
 msgid "Encrypt when replying to encrypted message"
 msgstr "回覆加密郵件時也進行加密"
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1331
 msgid "Use ASCII-armored format for encryption"
 msgstr "使用 ASCII-armored 格式做加密"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1333
 msgid "Use clear text signature"
 msgstr "使用明碼簽章"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1338
 msgid "Sign key"
 msgstr "簽章金鑰"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1346
 msgid "Use default GnuPG key"
 msgstr "使用預設的 GnuPG 金鑰"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1355
 msgid "Select key by your email address"
 msgstr "根據你的電子郵件地址選擇金鑰"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1364
 msgid "Specify key manually"
 msgstr "手動指定金鑰"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1380
 msgid "User or key ID:"
 msgstr "使用者代號或金鑰的識別碼："
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1474 src/prefs_account_dialog.c:1491
+#: src/prefs_account_dialog.c:1507 src/prefs_account_dialog.c:1525
 msgid "Don't use SSL"
 msgstr "不使用 SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1477
 msgid "Use SSL for POP3 connection"
 msgstr "POP3 連線時使用 SSL"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1480 src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1531
 msgid "Use STARTTLS command to start SSL session"
 msgstr "用 STARTTLS 命令來啟動 SSL"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1494
 msgid "Use SSL for IMAP4 connection"
 msgstr "IMAP4 連線時使用 SSL"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1500
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1515
 msgid "Use SSL for NNTP connection"
 msgstr "NNTP 連線時使用 SSL"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1517
 msgid "Send (SMTP)"
 msgstr "送信設定 (SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1528
 msgid "Use SSL for SMTP connection"
 msgstr "SMTP 連線時使用 SSL"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1539
 msgid "Use non-blocking SSL"
 msgstr "使用 non-blocking SSL"
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1542
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "若您使用 SSL 連線時發生問題，請關閉此選項。"
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1632
 msgid "Specify SMTP port"
 msgstr "指定 SMTP 連接埠"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1638
 msgid "Specify POP3 port"
 msgstr "指定 POP3 連接埠"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1644
 msgid "Specify IMAP4 port"
 msgstr "指定 IMAP4 連接埠"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1650
 msgid "Specify NNTP port"
 msgstr "指定 NNTP 連接埠"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1655
 msgid "Specify domain name"
 msgstr "指定網域"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1676
 msgid "IMAP server directory"
 msgstr "IMAP 伺服器目錄"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1686
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1689
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "接收伺服器上所有的郵件。"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1734
 msgid "Put sent messages in"
 msgstr "將已送出之郵件存到"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1736
 msgid "Put draft messages in"
 msgstr "將郵件草稿存到"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1738
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "將刪除郵件存到"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1740
 msgid "Put deleted messages in"
 msgstr "將刪除郵件存到"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1804
 msgid "Account name is not entered."
 msgstr "未輸入帳號名稱。"
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1808
 msgid "Mail address is not entered."
 msgstr "未輸入電子郵件信箱。"
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1813
 msgid "SMTP server is not entered."
 msgstr "未輸入發送郵件伺服器。"
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1818
 msgid "User ID is not entered."
 msgstr "未輸入使用者帳號。"
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1823
 msgid "POP3 server is not entered."
 msgstr "未輸入接收郵件伺服器。"
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1828
 msgid "IMAP4 server is not entered."
 msgstr "未輸入接收郵件伺服器。"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1833
 msgid "NNTP server is not entered."
 msgstr "未輸入新聞伺服器。"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1859
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1933
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5975,84 +5985,84 @@ msgstr ""
 "您所希望的收件者。\n"
 "即使如此您還是信任去使用它嗎？"
 
-#: src/send_message.c:183
+#: src/send_message.c:184
 msgid "Queued message header is broken.\n"
 msgstr "暫存資料夾中的郵件標頭錯誤。\n"
 
-#: src/send_message.c:402
+#: src/send_message.c:403
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "使用命令 %s 送出郵件\n"
 
-#: src/send_message.c:411
+#: src/send_message.c:412
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "無法執行命令：%s"
 
-#: src/send_message.c:446
+#: src/send_message.c:447
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "執行命令 %s 時發生錯誤"
 
-#: src/send_message.c:552
+#: src/send_message.c:560
 msgid "Connecting"
 msgstr "連線中"
 
-#: src/send_message.c:554
+#: src/send_message.c:562
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "連線到 SMTP 伺服器 %s..."
 
-#: src/send_message.c:623
+#: src/send_message.c:631
 msgid "Sending HELO..."
 msgstr "送出 HELO 標頭..."
 
-#: src/send_message.c:624 src/send_message.c:629 src/send_message.c:634
+#: src/send_message.c:632 src/send_message.c:637 src/send_message.c:642
 msgid "Authenticating"
 msgstr "認證中..."
 
-#: src/send_message.c:625 src/send_message.c:630
+#: src/send_message.c:633 src/send_message.c:638
 msgid "Sending message..."
 msgstr "送出郵件中..."
 
-#: src/send_message.c:628
+#: src/send_message.c:636
 msgid "Sending EHLO..."
 msgstr "送出 EHLO 標頭..."
 
-#: src/send_message.c:637
+#: src/send_message.c:645
 msgid "Sending MAIL FROM..."
 msgstr "送出 MAIL FROM 標頭..."
 
-#: src/send_message.c:638 src/send_message.c:642 src/send_message.c:647
+#: src/send_message.c:646 src/send_message.c:650 src/send_message.c:655
 msgid "Sending"
 msgstr "送信中"
 
-#: src/send_message.c:641
+#: src/send_message.c:649
 msgid "Sending RCPT TO..."
 msgstr "送出 RCPT TO 標頭..."
 
-#: src/send_message.c:646
+#: src/send_message.c:654
 msgid "Sending DATA..."
 msgstr "送出郵件資料 DATA..."
 
-#: src/send_message.c:650
+#: src/send_message.c:658
 msgid "Quitting..."
 msgstr "離開中..."
 
-#: src/send_message.c:678
+#: src/send_message.c:686
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "送出新郵件 (%d / %d 位元組)"
 
-#: src/send_message.c:706
+#: src/send_message.c:714
 msgid "Sending message"
 msgstr "送出郵件"
 
-#: src/send_message.c:750 src/send_message.c:770
+#: src/send_message.c:758 src/send_message.c:778
 msgid "Error occurred while sending the message."
 msgstr "送信時發生錯誤。"
 
-#: src/send_message.c:753
+#: src/send_message.c:761
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"