added the option 'Filter new messages in INBOX on receiving'.

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

35 files changed, 7447 insertions, 7286 deletions

diff --git a/ChangeLog b/ChangeLog
index f02d59c4..7043e671 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-01-18
 
+	* src/prefs_account_dialog.c: prefs_account_receive_create(): added
+	  the option "Filter new messages in INBOX on receiving".
+
+2007-01-18
+
 	* src/mainwindow.c: main_window_toolbar_create(): added separator
 	  between junk and next (or execute).
 
diff --git a/ChangeLog.ja b/ChangeLog.ja
index b2ad3b11..00290c1d 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
 2007-01-18
 
+	* src/prefs_account_dialog.c: prefs_account_receive_create():
+	  オプション「受信時に INBOX の新着メッセージを振り分ける」を追加。
+
+2007-01-18
+
 	* src/mainwindow.c: main_window_toolbar_create(): junk と next (または
 	  execute) の間にセパレータを追加。
 
diff --git a/po/bg.po b/po/bg.po
index 19afb58e..61f1fda0 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2004-01-09 02:06+0200\n"
 "Last-Translator: Pavel Pyuter <pavel@unix-bg.org>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -20,196 +20,196 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "丼亠��亠仆亠 仆舒 从仂仆��亳亞����舒��亳�� 亰舒 于��亠从亳 舒从舒��仆��...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 于����亰从舒��舒 亟仂 %s ��亠 ��舒亰仗舒亟仆舒. 弌于����亰于舒仆亠...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP 亟亳��亠从��仂��亳�� 仆舒 ������于����舒"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "����亰亟舒于舒仆亠 仆舒 IMAP4 于����亰从舒 亟仂 %s:%d ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 ����舒����亳��舒 TLS ��亠��亳��.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "��亰����亳于舒仆亠 仆舒 ����仂弍��亠仆亳亠 %d"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "��亰仗��舒��舒仆亠 仆舒 ����仂弍��亠仆亳亠 (%d / %d 弍舒亶��舒)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "��仂仗亳��舒仆亠 仆舒 ����仂弍��亠仆亳亠 %s%c%d 于��于 %s ...\n"
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "��仂仗亳��舒仆亠 仆舒 ����仂弍��亠仆亳亠 %s%c%d 于��于 %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "��仂仍����舒于舒仆亠 仆舒 ����仂弍��亠仆亳�� 仂�� %s..."
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "仆亠 仄仂亞舒�� 亟舒 ��亠 ������舒仆仂于���� 亳亰����亳��亳 ��仍舒亞仂于亠: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 亰舒仍亳��亳\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "��仂仍����舒于舒仆亠 仆舒 ����仂弍��亠仆亳�� 仂�� %s..."
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "仆亠 仄仂亞舒�� 亟舒 ��亠 ������舒仆仂于���� 亳亰����亳��亳 ��仍舒亞仂于亠: 1:*\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "仆亠 仄仂亢亠 亟舒 亰舒��于仂��亳 仗舒仗从舒\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "从仂��亠仆仆舒��舒 仗舒仗从舒 %s 仆亠 ������亠����于��于舒\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "亞��亠��从舒 仗��亳 仗仂仍����舒于舒仆亠 仆舒 LIST.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 ����亰亟舒亟亠 '%s'\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 ����亰亟舒亟亠 '%s' 仗仂亟 ����仂亟����亳\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 ����亰亟舒亟亠 仗仂��亠仆��从舒 从����亳��: LIST ��亠 仗��仂于舒仍亳\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 ����亰亟舒亟亠 仗仂��亠仆��从舒 从����亳��\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 仗��亠亳仄亠仆��于舒 仗仂��亠仆��从舒 从����亳��: %s 亟仂 %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 亳亰����亳亠 仗仂��亠仆��从舒 从����亳��\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 于亰亠仄亠 envelope\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "��亰仗��舒��舒仆亠 仆舒 ����仂弍��亠仆亳亠 (%d / %d 弍舒亶��舒)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "亞��亠��从舒 仗��亳 于亰亠仄舒仆亠 仆舒 envelope.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 舒仆舒仍亳亰亳��舒 envelope: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 ������舒仆仂于亳 于����亰从舒 �� IMAP4 ������于����: %s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 ������舒仆仂于亳 IMAP4 ��亠��亳�� ��:  %s:%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 仗仂仍����亳 仗��仂������舒仆����于仂��仂 仂�� 亳仄亠仆舒\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 亳亰弍亠��亠 仗舒仗从舒: %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "亞��亠��从舒 仗��亳 imap 从仂仄舒仆亟舒: CLOSE\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 ��亟仂����仂于亠���磦舒仆亠 仗��仂于舒仍亠仆仂.\n"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 于仍亳亰舒仆亠 仗��仂于舒仍亠仆仂.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 仗��亳弍舒于亳 %s 从��仄 %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(亳亰仗��舒��舒仆亠 仆舒 ��舒亶仍...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "����仂弍��亠仆亳亠��仂 仆亠 仄仂亢亠 亟舒 ��亠 仗��亳弍舒于亳 从��仄 %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 从仂仗亳��舒 %s 于 %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "亞��亠��从舒 仗��亳 imap 从仂仄舒仆亟舒: STORE %s %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "亞��亠��从舒 仗��亳 imap 从仂仄舒仆亟舒: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 msgid "error while imap command: CLOSE\n"
 msgstr "亞��亠��从舒 仗��亳 imap 从仂仄舒仆亟舒: CLOSE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv 仆亠 仄仂亢亠 亟舒 仗��亠仂弍��舒亰��于舒 UTF-7 亟仂 %s\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv 仆亠 仄仂亢亠 亟舒 仗��亠仂弍��舒亰��于舒 %s 亟仂 UTF-7\n"
@@ -294,25 +294,25 @@ msgstr "仗仂��亠仆��从舒��舒 从����亳�� 仆亠 仄仂亢亠 亟舒 ��亠 ����从��舒��亳 �
 msgid "Exporting messages from %s into %s...\n"
 msgstr "��亰仆舒���礌亠 仆舒 ����仂弍��亠仆亳�� 仂�� %s 于��于 %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 从仂仗亳��舒 ����仂弍��亠仆亳亠��仂 %s 于��于 %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 仂��于仂��亳 ��舒亶仍���� �� 仄舒��从亳��仂于从亳��亠.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "亳亰��仂亟仆舒��舒 仗舒仗从舒 亠 亠亟仆舒从于舒 �� 仆舒亰仆舒��亠仆亳亠��仂.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "��仂仗亳��舒仆亠 仆舒 ����仂弍��亠仆亳亠 %s%c%d 于��于 %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -321,7 +321,7 @@ msgstr ""
 "个舒亶仍���� `%s' 于亠��亠 ������亠����于��于舒.\n"
 "��舒仗从舒��舒 仆亠 仄仂亢亠 亟舒 ��亠 ����亰亟舒亟亠."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -333,77 +333,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "����亰亟舒于舒仆亠 仆舒 NNTP 于����亰从舒 亟仂 %s:%d ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP 于����亰从舒��舒 亟仂 %s:%d 弍亠��亠 仗��亠从����仆舒��舒. 弌于����亰于舒仆亠...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "����舒��亳�� %d 亠 于亠��亠 从亠��亳��舒仆舒.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "于亰亳仄舒仆亠 仆舒 ����舒��亳�� %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 仗��仂��亠��亠 ����舒��亳�� %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 仗��弍仍亳从��于舒 ����舒��亳��.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 亳亰于仍亠��亠 ����舒��亳�� %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 亳亰弍亠��亠 亞����仗舒 %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, fuzzy, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "��亠于舒仍亳亟亠仆 仂弍��于舒�� 仆舒 ����舒��亳亳: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "仆�礆舒 仆仂于亳 ����舒��亳亳.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "仗仂仍����舒于舒仆亠 仆舒 xover %d - %d 于 %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 仗仂仍����亳 xover\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "亞��亠��从舒 仗��亳 仗仂仍����舒于舒仆亠��仂 仆舒 xover.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "仆亠于舒仍亳亟亠仆 xover ��亠亟: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 仗仂仍����亳 xhdr\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "亞��亠��从舒 仗��亳 仗仂仍����舒于舒仆亠��仂 仆舒 xhdr.\n"
 
@@ -482,7 +482,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "亞��亠��从舒 仗��亳 POP3 ��亠��亳����舒\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "仆亠����仗亠��仆仂 亰舒仗亳��于舒仆亠 仆舒 仆舒������仂亶从亳��亠 于��于 ��舒亶仍\n"
@@ -514,12 +514,12 @@ msgstr ""
 msgid "can't open mark file\n"
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 仂��于仂��亳 ��舒亶仍���� �� 仄舒��从亳��仂于从亳��亠\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 于亰亠仄亠 ����仂弍��亠仆亳亠��仂 %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "��亠于舒仍亳亟亠仆 从仂仄舒仆亟亠仆 ��亠亟 亰舒 仗亠��舒��: `%s'\n"
@@ -687,7 +687,7 @@ msgstr ""
 msgid "Name"
 msgstr "��仄亠"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "����仂��仂从仂仍"
 
@@ -1156,7 +1156,7 @@ msgid "Group"
 msgstr "������仗舒"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "��舒仗从舒"
@@ -1189,7 +1189,7 @@ msgstr "��舒弍亠仍亠亢从舒"
 msgid "Warning"
 msgstr "����亠亟��仗��亠亢亟亠仆亳亠"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "����亠��从舒"
 
@@ -1745,7 +1745,7 @@ msgstr "MIME ��亳仗"
 msgid "Size"
 msgstr "��舒亰仄亠��"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "��亰仗��舒��舒仆亠"
@@ -1787,7 +1787,7 @@ msgid "Attach file"
 msgstr "����亳从��亠仗于舒仆亠 仆舒 ��舒亶仍"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "弌亳亞仆舒������舒"
@@ -2001,7 +2001,7 @@ msgid " Check File "
 msgstr " ����仂于亠��从舒 仆舒 ��舒亶仍 "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "个舒亶仍"
 
@@ -2079,7 +2079,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2144,7 +2144,7 @@ msgstr "��舒��亰舒 (��亠从)"
 msgid "Maximum Entries"
 msgstr "��舒从��亳仄��仄 亰舒仗亳��亳"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "����仆仂于仆亳"
 
@@ -2201,7 +2201,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "��亰弍仂��..."
 
@@ -2357,12 +2357,12 @@ msgstr "丕����舒仆仂于�磦舒仆亠 亳仆��仂��仄舒��亳�� 亰舒 仗舒仗从舒...\n"
 msgid "Setting folder info..."
 msgstr "丕����舒仆仂于�磦舒仆亠 亳仆��仂��仄舒��亳�� 亰舒 仗舒仗从舒..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "弌从舒仆亳��舒仆亠 仆舒 仗舒仗从舒 %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "弌从舒仆亳��舒仆亠 仆舒 仗舒仗从舒 %s ..."
@@ -2635,7 +2635,7 @@ msgstr "��仆舒���礌亠 仆舒 LDIF ��舒亶仍 于 ��亟��亠��仆舒��舒 从仆亳亞舒"
 msgid "Prev"
 msgstr "����亠亟亳��亠仆"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "弌仍亠亟于舒��"
 
@@ -2656,144 +2656,144 @@ msgstr "��舒于������于舒仆亠"
 msgid "Sylpheed: %d new messages"
 msgstr "��舒于������亠仆仂 (%d 仆仂于亳 ����仂弍��亠仆亳��)"
 
-#: src/inc.c:388
+#: src/inc.c:433
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "丕亟仂����仂于亠���磦舒仆亠"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "��仂仍����舒于舒仆亠 仆舒 仆仂于亳 ����仂弍��亠仆亳��"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "��亰��舒从于舒仆亠"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "����从舒亰舒仆"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "��仂仍����舒于舒仆亠"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "��舒于������亠仆仂 (%d ����仂弍��亠仆亳�� (%s) 仗仂仍����亠仆亳)"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "��舒于������亠仆仂 (仆�礆舒 仆仂于亳 ����仂弍��亠仆亳��)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "������亰从舒��舒 ��亠 仗��仂于舒仍亳"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "丕亟仂����仂于亠���磦舒仆亠��仂 ��亠 仗��仂于舒仍亳"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "��舒从仍�ﾑ�亠仆"
 
-#: src/inc.c:637
+#: src/inc.c:682
 #, fuzzy
 msgid "Timeout"
 msgstr "��舒��亰舒 (��亠从)"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "��舒于������亠仆仂 (%d 仆仂于亳 ����仂弍��亠仆亳��)"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "��舒于������亠仆仂 (仆�礆舒 仆仂于亳 ����仂弍��亠仆亳��)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "����亰仆亳从仆舒��舒 亞��亠��从亳 仗��亳 仗仂仍����舒于舒仆亠 仆舒 仗仂��舒��舒."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "仗仂仍����舒于舒仆亠 仆舒 仆仂于亳 ����仂弍��亠仆亳�� 仂�� 舒从舒��仆�� %s...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "丕亟仂����仂于亠���磦舒仆亠"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: ��仂仍����舒于舒仆亠 仆舒 仆仂于亳 ����仂弍��亠仆亳��"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "弌于����亰于舒仆亠 �� POP3 ������于����: %s..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 ������舒仆仂于亳 于����亰从舒 �� POP3 ������于����: %s:%d\n"
 
-#: src/inc.c:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "丕亟仂����仂于亠���磦舒仆亠..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "��仂仍����舒于舒仆亠 仆舒 ����仂弍��亠仆亳�� 仂�� %s..."
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "��亰亳仄舒仆亠 仆舒 弍��仂���� 仆舒 仆仂于亳 ����仂弍��亠仆亳�� (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "��亰亳仄舒仆亠 仆舒 弍��仂���� 仆舒 仆仂于亳 ����仂弍��亠仆亳�� (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "��亰亳仄舒仆亠 仆舒 弍��仂���� 仆舒 仆仂于亳 ����仂弍��亠仆亳�� (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "��亰亳仄舒仆亠 仆舒 ��舒亰仄亠������ 仆舒 ����仂弍��亠仆亳����舒 (LIST)... "
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "��亰����亳于舒仆亠 仆舒 ����仂弍��亠仆亳亠 %d"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "����亠从����于舒仆亠"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "��仂仍����舒于舒仆亠 仆舒 ����仂弍��亠仆亳亠 (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "��仂仍����舒于舒仆亠 (%d ����仂弍��亠仆亳�� (%s) 仗仂仍����亠仆亳)"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 msgid "Connection failed."
 msgstr "������亰从舒��舒 仗��仂于舒仍亠仆舒"
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "����亰仆亳从仆舒 亞��亠��从舒 仗��亳 仂弍��舒弍仂��从舒 仆舒 仗仂��舒��舒"
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2802,28 +2802,28 @@ msgstr ""
 "����亰仆亳从仆舒 亞��亠��从舒 仗��亳 仂弍��舒弍仂��从舒 仆舒 仗仂��舒��舒:\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "���礆舒 ��于仂弍仂亟仆仂 仄������仂 仆舒 亟亳��从舒"
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "个舒亶仍���� 仆亠 仄仂亢亠 亟舒 ��亠 亰舒仗亳��亠."
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "����亠��从舒 于 ��仂从亠��."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr "������亰从舒��舒 亠 仗��亠从��舒��亠仆舒 仂�� 仂��亟舒仍亠��亠仆亳�� ��仂����."
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "��仂��亠仆��从舒��舒 从����亳�� 亠 亰舒从仍�ﾑ�亠仆舒."
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2832,11 +2832,11 @@ msgstr ""
 "��仂��亠仆��从舒��舒 从����亳�� 亠 亰舒从仍�ﾑ�亠仆舒:\n"
 "%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 msgid "Authentication failed."
 msgstr "丕亟仂����仂于亠���磦舒仆亠��仂 ��亠 仗��仂于舒仍亳."
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2845,16 +2845,16 @@ msgstr ""
 "丕亟仂����仂于亠���磦舒仆亠��仂 ��亠 仗��仂于舒仍亳:\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 #, fuzzy
 msgid "Session timed out."
 msgstr "��亠��亳����舒 亠 仗��仂����仂��亠仆舒\n"
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "��弍亠亟亳仆�磦舒仆亠��仂 亠 仂��仄亠仆亠仆仂\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "��仂仍����舒于舒仆亠 仆舒 仆仂于亳 ����仂弍��亠仆亳�� 仂�� %s 于 %s...\n"
@@ -3767,7 +3767,7 @@ msgstr "����亳亠仄舒仆亠 仆舒 仆仂于舒 仗仂��舒 仂�� 于��亳��从亳 舒从舒��仆��亳
 msgid "Send queued message(s)"
 msgstr "��亰仗��舒��舒仆亠 仆舒 ����仂弍��亠仆亳����舒 于 仂仗舒��从舒��舒"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "弌������舒于�礌亠"
@@ -3809,62 +3809,62 @@ msgstr "��亰����亳于舒仆亠 仆舒 ����仂弍��亠仆亳亠��仂"
 msgid "Set as junk mail"
 msgstr "丕����舒仆仂于�磦舒仆亠 从舒��仂 仗仂亟��舒亰弍亳��舒�� ��亠"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "��亰仗��仍仆�磦舒仆亠"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "��亰仗��仍仆�磦舒仆亠 仆舒 仄舒��从亳��舒仆亳�� 仗��仂��亠��"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "弌仍亠亟于舒��仂 仆亠仗��仂��亠��亠仆仂 ����仂弍��亠仆亳亠"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "����亠亟仗仂��亳��舒仆亳��"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "��弍��亳 仗��亠亟仗仂��亳��舒仆亳��"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "��从舒��仆��"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "��仂仆��亳亞����亳��舒仆亠 仆舒 舒从舒��仆��"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr "��舒弍仂��亳��亠 弍亠亰 亟仂������仗 亟仂 仄��亠亢舒. 乂��舒从仆亠��亠 亳从仂仆舒��舒 亰舒 亟舒 于从仍�ﾑ�亳��亠 仄��亠亢舒��舒."
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr "��舒弍仂��亳��亠 �� 亟仂������仗 亟仂 仄��亠亢舒. 乂��舒从仆亠��亠 亳从仂仆舒��舒 亰舒 亟舒 亳亰从仍�ﾑ�亳��亠 仄��亠亢舒��舒."
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "��亰��仂亟"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "��亠仍舒亠��亠 仍亳 亳亰��仂亟 仂�� 仗��仂亞��舒仄舒��舒?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 #, fuzzy
 msgid "Command line options"
 msgstr "��亠 亠 于��于亠亟亠仆 从仂仄舒仆亟亠仆 ��亠亟."
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "丕仗仂����亠弍舒: %s [����丶��亊]...\n"
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3880,7 +3880,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4090,226 +4090,231 @@ msgstr ""
 "��亠仗��舒于亳仍仆舒 仗舒��仂仍舒! ��仗亳��舒亶��亠 仂��仆仂于仂...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "����于舒���礌亠 仆舒 仗��仂亰仂��亠�� �� 仗��亠亟仗仂��亳��舒仆亳����舒 亰舒 舒从舒��仆��舒...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "��从舒��仆��%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "����亠亟仗仂��亳��舒仆亳�� 亰舒 仆仂于 舒从舒��仆��"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "����亠亟仗仂��亳��舒仆亳�� 亰舒 舒从舒��仆��"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "弌��亰亟舒于舒仆亠 仆舒 仗��仂亰仂��亠�� �� 仗��亠亟仗仂��亳��舒仆亳����舒 亰舒 舒从舒��仆��舒...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "��仂仍����舒于舒仆亠"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "��亠仗��亳从仂��仆仂于亠仆仂����"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "��舒仗��亠亟仆舒仍"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "��仄亠 仆舒 舒从舒��仆������"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "丕����舒仆仂于�磦舒仆亠 从舒��仂 仗仂亟��舒亰弍亳��舒�� ��亠"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "��亳��仆舒 亳仆��仂��仄舒��亳��"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "����仍仆仂 亳仄亠"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "��仂��亠仆��从亳 舒亟��亠��"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "����亞舒仆亳亰舒��亳��"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "��仆��仂��仄舒��亳�� 亰舒 ������于����舒"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "��仂于亳仆亳 (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "��亠亰 (仍仂从舒仍仆仂)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "弌����于�������� 亳亰亳��从于舒 ��亟仂����仂于亠���磦舒仆亠"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "��仂于亳仆舒����从亳 ������于����"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "弌����于���� 亰舒 仗仂仍����舒于舒仆亠"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "SMTP ������于���� (亳亰仗��舒��舒仆亠)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "��仂����亠弍亳��亠仍��从亳 ID"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "��舒��仂仍舒"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "弌����于�������� 亳亰亳��从于舒 ��亟仂����仂于亠���磦舒仆亠"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "��亰����亳于舒仆亠 ����仂弍��亠仆亳����舒 仂�� ������于����舒 从仂亞舒��仂 ��亠 仗仂仍����舒��"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "����亠仄舒��于舒仆亠 ��仍亠亟"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "亟仆亳"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 亟仆亳: 仆亠亰舒弍舒于仆仂 仗��亠仄舒��于舒仆亠)"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "��亰��亠亞仍�礌亠 仆舒 于��亳��从亳 ����仂弍��亠仆亳�� 仂�� ������于����舒"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "��亞��舒仆亳��亠仆亳亠 仆舒 ��舒亰仄亠��舒 仗��亳 仗仂仍����舒于舒仆亠"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "��B"
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "个亳仍����亳��舒仆亠 仆舒 ����仂弍��亠仆亳����舒 仗��亳 仗仂仍����舒于舒仆亠"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "����仂亟����舒 从����亳��"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(��亠��亳仍����亳��舒仆亳��亠 ����仂弍��亠仆亳�� ��亠 弍��亟舒�� ��������舒仆�磦舒仆亳 于 ��舒亰亳 仗舒仗从舒)"
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "��亠��仂亟 仆舒 ��亟仂����仂于亠���磦舒仆亠"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "��于��仂仄舒��亳��仆仂"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "弌舒仄仂 仗��亳 ������仆仂 仗仂仍����舒于舒仆亠"
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "个亳仍����亳��舒仆亠 仆舒 ����仂弍��亠仆亳����舒 仗��亳 仗仂仍����舒于舒仆亠"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "��仂于亳仆亳"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "��舒从��亳仄舒仍亠仆 弍��仂亶 亳亰��亠亞仍�礌亳 ����舒��亳亳\n"
 "(仆亠仂亞��舒仆亳��亠仆仂 舒从仂 亠 于��于亠亟亠仆舒 0)"
 
-#: src/prefs_account_dialog.c:1024
+#: src/prefs_account_dialog.c:1030
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "��亠 亠 ��从舒亰舒仆 仗仂仍����舒��亠仍"
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 msgid "`Get all' checks for new messages on this account"
 msgstr "'��仂仍����舒于舒仆亠 于��亳��从亳' 仗��仂于亠���磦舒 亰舒 仆仂于亳 ����仂弍��亠仆亳�� 于 ��仂亰亳 舒从舒��仆��"
 
-#: src/prefs_account_dialog.c:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "��舒亞仍舒于仆舒 ��舒����"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "��仂弍舒于�礌亠 仆舒 亰舒亞仍舒于仆舒 ��舒���� ��舒��舒"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "��亠仆亠��亳��舒仆亠 仆舒 Message-ID"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "��仂弍舒于�礌亠 仆舒 亰舒亞仍舒于仆舒 ��舒���� 仂�� 仗仂����亠弍亳��亠仍��"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " ��亠亟舒从��亳��舒仆亠... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "丕亟仂����仂于亠���磦舒仆亠"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP 丕亟仂����仂于亠���磦舒仆亠 (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4318,200 +4323,200 @@ msgstr ""
 "��从仂 仂����舒于亳��亠 ��亠亰亳 仗仂仍亠��舒 仗��舒亰仆亳, ��亠 弍��亟舒�� 亳亰仗仂仍亰于舒仆亳\n"
 "������亳��亠 user ID 亳 仗舒��仂仍舒 从舒��仂 亰舒 仗仂仍����舒于舒仆亠."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "丕亟仂����仂于亠���磦舒仆亠 �� POP3 仗��亠亟亳 亳亰仗��舒��舒仆亠"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 msgid "Command output"
 msgstr "��亰��仂亟 仆舒 从仂仄舒仆亟舒"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "��于��仂仄舒��亳��仆仂 ������舒仆仂于�磦舒仆亠 仆舒 ��仍亠亟仆亳��亠 舒亟��亠��亳"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "����亞仂于仂��-亟仂"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "��仂亟仗亳��于舒仆亠 仗仂 仗仂亟��舒亰弍亳��舒仆亠"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "����亳仗��亳��舒仆亠 仗仂 仗仂亟��舒亰弍亳��舒仆亠"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "��亰仗仂仍亰于舒仆亠 仆舒 ASCII-armored ��仂��仄舒�� 亰舒 从��亳仗��亳��舒仆亠"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "��亰仗仂仍亰于舒仆亠 仆舒 仗仂亟仗亳�� 于 ��亳���� ��亠从����"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "��仂亟仗亳��于舒�� 从仍�ﾑ�"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "��亰仗仂仍亰于舒仆亠 仆舒 仗仂亟��舒亰弍亳��舒��亳�� ��亠 GnuPG 从仍�ﾑ�"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "��亰弍仂�� 仆舒 从仍�ﾑ� 仗仂 于舒��亳�� email 舒亟��亠��"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "������亠仆 亳亰弍仂�� 仆舒 从仍�ﾑ�"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "ID 仆舒 仗仂����亠弍亳��亠仍�� 亳仍亳 从仍�ﾑ�舒:"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "��亠 ��亠 亳亰仗仂仍亰于舒 SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "��亰仗仂仍亰于舒仆亠 仆舒 SSL 亰舒 POP3 于����亰从舒"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "��亰仗仂仍亰于舒仆亠 仆舒 STARTTLS 从仂仄舒仆亟舒 亰舒 ����舒���� 仆舒 SSL ��亠��亳��"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "��亰仗仂仍亰于舒仆亠 仆舒 SSL 亰舒 IMAP4 于����亰从舒"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "��亰仗仂仍亰于舒仆亠 仆舒 SSL 亰舒 NNTP 于����亰从舒"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "��亰仗��舒��舒仆亠 (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "��亰仗仂仍亰于舒仆亠 仆舒 SSL 亰舒 SMTP 于����亰从舒"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr "��亰仗仂仍亰于舒仆亠 仆舒 仆亠弍仍仂从亳��舒�� SSL"
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(��亰从仍�ﾑ�亠��亠 舒从仂 亳仄舒��亠 仗��仂弍仍亠仄亳 �� SSL 于����亰从舒)"
 
-#: src/prefs_account_dialog.c:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "��仗��亠亟亠仍�礌亠 仆舒 SMTP 仗仂����"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "��仗��亠亟亠仍�礌亠 仆舒 POP3 仗仂����"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "��仗��亠亟亠仍�礌亠 仆舒 IMAP4 仗仂����"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "��仗��亠亟亠仍�礌亠 仆舒 NNTP 仗仂����"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "��仗��亠亟亠仍�礌亠 仆舒 亳仄亠 仆舒 亟仂仄亠亶仆"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "IMAP 亟亳��亠从��仂��亳�� 仆舒 ������于����舒"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "��亰��亠亞仍�礌亠 仆舒 于��亳��从亳 ����仂弍��亠仆亳�� 仂�� ������于����舒"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "��仂����舒于�礌亠 仆舒 亳亰仗��舒��亠仆亳 ����仂弍��亠仆亳�� 于"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "��仂����舒于�礌亠 仆舒 ��亠��仆仂于亳��亠 于"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "��仂����舒于�礌亠 仆舒 亳亰����亳��亳 ����仂弍��亠仆亳�� 于"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "��仂����舒于�礌亠 仆舒 亳亰����亳��亳 ����仂弍��亠仆亳�� 于"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "��亠 亠 于��于亠亟亠仆仂 亳仄亠 仆舒 舒从舒��仆��舒."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "��亠 亠 于��于亠亟亠仆 仗仂��亠仆��从亳 舒亟��亠��."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "��亠 亠 于��于亠亟亠仆 SMTP ������于����."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "��亠 亠 于��于亠亟亠仆 仗仂����亠弍亳��亠仍��从亳 ID."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "��亠 亠 于��于亠亟亠仆 POP3 ������于����."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "��亠 亠 于��于亠亟亠仆 IMAP4 ������于����."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "��亠 亠 于��于亠亟亠仆 NNTP ������于����."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6819,36 +6824,36 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_��舒仗舒亰于舒仆亠 从舒��仂..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "弌������舒于�礌亠 仆舒 仆仂于仂 ����仂弍��亠仆亳亠"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/��仂弍舒于�礌亠 仆舒 仗仂亟舒��亠仍�� 于 舒亟��亠��仆舒��舒 从仆亳亞舒"
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "����弍仍亳��亠仆 舒亟��亠��"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "丕亠弍 弍��舒��亰����"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6857,7 +6862,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index 14ada79e..a7cbf931 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2003-05-30 13:31GMT+0100\n"
 "Last-Translator: Radek Vyb鱈ral <Radek.Vybiral@vsb.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -19,200 +19,200 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Na��鱈t叩m nastaven鱈 pro v邸echny 炭��ty...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 spojen鱈 s %s:%d bylo rozpojeno. Obnovuji spojen鱈...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "adres叩�� pro IMAP server"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "vytv叩��鱈m spojen鱈 IMAP4 s %s:%d ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "Nelze spustit TLS sezen鱈.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Vymaz叩v叩m zpr叩vu %d"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Pos鱈l叩m zpr叩vu (%d / %d byt哲)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "P��esouv叩m zpr叩vu %s%c%d do %s...\n"
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kop鱈ruji zpr叩vu %s%c%d do %s...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Z鱈sk叩v叩m zpr叩vy z %s do %s...\n"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nelze nastavit p��鱈znak smaz叩n鱈: %d\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "nelze odstranit\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Z鱈sk叩v叩m zpr叩vy z %s do %s...\n"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nelze nastavit p��鱈znak smazan辿: 1: %d\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "nelze vybrat slo転ku: %s\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Ozna��en箪 soubor nebyl nalezen.\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "B��hem p��鱈kazu LIST se vyskytla chyba.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Nemohu vytvo��it '%s'\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Nemohu vytvo��it '%s' v Doru��en辿 po邸t��\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nelze vytvo��it po邸tovn鱈 schr叩nku: selhal p��鱈kaz LIST\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "nelze vytvo��it po邸tovn鱈 schr叩nku\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nelze p��ejmenovat po邸tovn鱈 schr叩nku: %s na %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "nelze smazat po邸tovn鱈 schr叩nku\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "Nemohu na��鱈st ob叩lku\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Pos鱈l叩m zpr叩vu (%d / %d byt哲)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "B��hem na��鱈t叩n鱈 ob叩lky se vyskytla chyba.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "Nemohu analyzovat ob叩lku: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nemohu se spojit s IMAP4 serverem: %s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nelze nav叩zat relaci s IMAP4 serverem: %s:%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "nemohu naj鱈t ob叩lku\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nelze vybrat slo転ku: %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "chyba p��鱈kazu slu転by imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autentikace selhala."
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "Ne炭sp��邸n辿 p��ihl叩邸en鱈 k IMAP4.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "Nemohu p��idat %s do %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(pos鱈l叩m soubor...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "nelze p��idat zpr叩vu %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nelze kop鱈rovat %d na %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "chyba p��鱈kazu slu転by imap: STORE %d %d %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "chyba p��鱈kazu slu転by imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "chyba p��鱈kazu slu転by imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nem哲転e konvertovat UTF-7 na %s\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nem哲転e konvertovat %s na UTF-7\n"
@@ -297,25 +297,25 @@ msgstr "nem哲転u smazat po邸tovn鱈 schr叩nku.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportuji zpr叩vy z %s do %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "Nemohu zkop鱈rovat zpr叩vu %s do %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "Nemohu otev��鱈t ozna��en箪 soubor.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "zdrojov叩 slo転ka je stejn叩 jako c鱈lov叩.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kop鱈ruji zpr叩vu %s%c%d do %s...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -324,7 +324,7 @@ msgstr ""
 "Soubor '%s' u転 existuje.\n"
 "Nemohu vytvo��it slo転ku."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -336,77 +336,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "Vytv叩��鱈m NNTP spojen鱈 s %s:%d ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP spojen鱈 %s:%d bylo p��eru邸eno. Obnovuji spojen鱈...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "p��鱈sp��vek %d u転 byl v mezipam��ti.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "Z鱈sk叩v叩m p��鱈sp��vek %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "Nemohu ��鱈st p��鱈sp��vek %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "Nemohu odeslat p��鱈sp��vek.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "Nemohu na��鱈st p��鱈sp��vek %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "Nemohu vybrat skupinu: %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neplatn箪 rozsah p��鱈sp��vk哲: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "貼叩dn箪 nov箪 p��鱈sp��vek.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "z鱈sk叩v叩m xover %d - %d v %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "nelze z鱈skat xover\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "B��hem z鱈sk叩v叩n鱈 xover se vyskytla chyba.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "Neplatn叩 xover ��叩dka: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "nelze z鱈skat xhdr\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "B��hem z鱈sk叩v叩n鱈 xhdr se vyskytla chyba .\n"
 
@@ -485,7 +485,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "v POP3 relaci se vyskytla\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "Selh叩n鱈 p��i z叩pisu konfigurace do souboru\n"
@@ -517,12 +517,12 @@ msgstr "procmime_get_text_content(): Ne炭sp��邸n叩 konverze k坦du.\n"
 msgid "can't open mark file\n"
 msgstr "nelze otev��鱈t ozna��en箪 soubor\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nelze na��鱈st zpr叩vu %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Neplatn箪 p��鱈kazov箪 ��叩dek tisku: '%s'\n"
@@ -690,7 +690,7 @@ msgstr ""
 msgid "Name"
 msgstr "Jm辿no"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -1157,7 +1157,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Slo転ka"
@@ -1190,7 +1190,7 @@ msgstr "Pozn叩mka"
 msgid "Warning"
 msgstr "Varov叩n鱈"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "Chyba"
 
@@ -1746,7 +1746,7 @@ msgstr "MIME typ"
 msgid "Size"
 msgstr "D辿lka"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "Odeslat"
@@ -1788,7 +1788,7 @@ msgid "Attach file"
 msgstr "P��ipoj鱈 soubor"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "Podpis"
@@ -2002,7 +2002,7 @@ msgid " Check File "
 msgstr " Otestovat soubor "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "Soubor"
 
@@ -2081,7 +2081,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2146,7 +2146,7 @@ msgstr "Timeout (vte��in)"
 msgid "Maximum Entries"
 msgstr "Maximum polo転ek"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "Z叩kladn鱈"
 
@@ -2203,7 +2203,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Vybrat... "
 
@@ -2359,12 +2359,12 @@ msgstr "Nastavuji informace o slo転ce...\n"
 msgid "Setting folder info..."
 msgstr "Nastavuji informace o slo転ce..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prohled叩v叩m slo転ku %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prohled叩v叩m slo転ku %s ..."
@@ -2638,7 +2638,7 @@ msgstr "Importovat LDIF soubor do datab叩ze adres"
 msgid "Prev"
 msgstr "P��edchoz鱈"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "Dal邸鱈"
 
@@ -2659,145 +2659,145 @@ msgstr "Konec"
 msgid "Sylpheed: %d new messages"
 msgstr "Dokon��eno (%d nov叩(辿) zpr叩va(y))"
 
-#: src/inc.c:388
+#: src/inc.c:433
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autentizuji"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "Na��鱈t叩m nov辿 zpr叩vy"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "V pohotovosti"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "Zru邸eno"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "Na��鱈t叩m"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hotovo (%d zpr叩v(a) (%s) p��ijato)"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "Hotovo (Nejsou 転叩dn辿 nov辿 zpr叩vy)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "Spojen鱈 selhalo"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "Autentizace selhala"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "Zamknuto"
 
-#: src/inc.c:637
+#: src/inc.c:682
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (vte��in)"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Dokon��eno (%d nov叩(辿) zpr叩va(y))"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "Dokon��eno (nejsou nov辿 zpr叩vy)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "B��hem na��鱈t叩n鱈 zpr叩v se vyskytly chyby."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, 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:739
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autentizuji"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Na��鱈t叩m nov辿 zpr叩vy"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "P��ipojuji se na POP3 server: %s ..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, 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:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Autentizuji..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Z鱈sk叩v叩m zpr叩vy z %s do %s...\n"
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Zji邸泥uji po��et nov箪ch zpr叩v (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Zji邸泥uji po��et nov箪ch zpr叩v (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Zji邸泥uji po��et nov箪ch zpr叩v (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "Zji邸泥uji po��et zpr叩v (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "Vymaz叩v叩m zpr叩vu %d"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "Ukon��uji"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Na��鱈t叩m zpr叩vu (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Hotovo (%d zpr叩v(a) (%s) p��ijato)"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 #, fuzzy
 msgid "Connection failed."
 msgstr "Spojen鱈 selhalo"
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "B��hem zpracov叩v叩n鱈 po邸ty se vyskytla chyba ."
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2806,28 +2806,28 @@ msgstr ""
 "B��hem zpracov叩v叩n鱈 po邸ty se vyskytla chyba:\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "Nezbylo 転叩dn辿 m鱈sto na disku."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "Nemohu zapisovat do souboru."
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "Chyba soketu."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "Po邸tovn鱈 schr叩nka je zam��ena."
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2836,11 +2836,11 @@ msgstr ""
 "Po邸tovn鱈 schr叩nka je zam��ena:\n"
 "%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 msgid "Authentication failed."
 msgstr "Autentikace selhala."
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2849,16 +2849,16 @@ msgstr ""
 "Autentikace selhala:\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 #, fuzzy
 msgid "Session timed out."
 msgstr "vypr邸el ��as relace\n"
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "Za��le��ov叩n鱈 zru邸eno\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Na��鱈t叩m nov辿 zpr叩vy z %s do %s...\n"
@@ -3771,7 +3771,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:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Napsat"
@@ -3813,62 +3813,62 @@ msgstr "Smazat zpr叩vu"
 msgid "Set as junk mail"
 msgstr "Nastavit jako v箪choz鱈"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "Prov辿st"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "Prov辿st ozna��en箪 proces "
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "Dal邸鱈 nep��e��tenou zpr叩vu"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "Nastaven鱈"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "Spole��n叩 nastaven鱈"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "����et"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "Nastaven鱈 炭��tu"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "Ukon��en鱈 programu"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "Chcete ukon��it tento program?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 #, fuzzy
 msgid "Command line options"
 msgstr "Nen鱈 nastavena p��鱈kazov叩 ��叩dka."
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Pou転it鱈: %s [VOLBY]...\n"
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3884,7 +3884,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4094,225 +4094,230 @@ msgstr ""
 "��patn叩 passphrase! Zkuste to znovu...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "Otev��en鱈 okna s nastaven鱈m 炭��tu...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "����et%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "Nastaven鱈 pro nov箪 炭��et"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Nastaven鱈 炭��tu"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "Vyvol叩n鱈 okna pro nastaven鱈 炭��tu...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "P��鱈jem"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "Soukrom鱈"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "Roz邸鱈��en鱈"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "N叩zev tohoto 炭��tu"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "Nastavit jako v箪choz鱈"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "Osobn鱈 informace"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "Cel辿 jm辿no"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "Po邸tovn鱈 adresa"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "Organizace"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "Informace o serveru"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "貼叩dn箪 (m鱈stn鱈)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "Tento server vy転aduje autentizaci"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "News server"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "Server pro p��鱈jem"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "SMTP server (odes鱈l叩n鱈)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "U転ivatelsk辿 jm辿no"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "Heslo"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Tento server vy転aduje autentizaci"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "Smazat zpr叩vy na serveru po jejich p��ijmut鱈"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "Odstranit po"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "dnech"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dn哲: odstranit ihned)"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "P��ijmout v邸echny zpr叩vy ze serveru"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "Limit velikosti pro p��鱈jem"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "Filtr zpr叩v pro p��鱈jem"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "V箪choz鱈 inbox"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 #, 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:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "Metoda autentizace"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "Filtr zpr叩v pro p��鱈jem"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "Diskuzn鱈 skupiny"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 #, 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:1024
+#: src/prefs_account_dialog.c:1030
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Nen鱈 uveden p��鱈jemce."
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 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:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Z叩hlav鱈"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "P��idat do z叩hlav鱈 pole s datumem"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "Generovat ��鱈slo zpr叩vy"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "P��idat u転ivatelsky definovan辿 z叩hlav鱈"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " Upravit..."
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "Autentizace"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP autentizace (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4321,199 +4326,199 @@ msgstr ""
 "Pokud nech叩te tyto polo転ky pr叩zdn辿, bude\n"
 "pou転ito stejn辿 jm辿no u転ivatele a heslo."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentizace s POP3 p��ed posl叩n鱈m"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 msgid "Command output"
 msgstr "V箪stup p��鱈kazu"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastavit n叩sleduj鱈c鱈 adresy"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "Kopie"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Slep叩 kopie"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "Odpov��d��t komu"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "V転dy p��idat podpis"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "V転dy za邸ifrovat zpr叩vu"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "Pou転鱈t form叩t ASCII-armored pro za邸ifrov叩n鱈"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "Pou転鱈t ��ist箪 textov箪 podpis"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "Kl鱈�� pro podpis"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "Pou転鱈t v箪choz鱈 GnuPG kl鱈��"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "Vybrat kl鱈�� podle email adresy"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "Zadat kl鱈�� ru��n��"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "U転ivatel nebo ID kl鱈��e:"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "Nepou転鱈vat SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "Pou転鱈t SSL pro POP3 spojen鱈"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 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:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "Pou転鱈t SSL pro IMAP4 spojen鱈"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "Pou転鱈t SSL pro NNTP p��ipojen鱈"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "Odes鱈l叩n鱈 (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "Pou転鱈t SSL pro SMTP p��ipojen鱈"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "Ur��ete SMTP port"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "Ur��ete POP3 port"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "Ur��ete IMAP4 port"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "Ur��ete NNTP port"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "Ur��ete n叩zev dom辿ny"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "adres叩�� pro IMAP server"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "P��ijmout v邸echny zpr叩vy ze serveru"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "Ukl叩dat odeslan辿 zpr叩vy do"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "Ukl叩dat koncepty do"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Ukl叩dat smazan辿 zpr叩vy do"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "Ukl叩dat smazan辿 zpr叩vy do"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "Nebylo zad叩no jm辿no 炭��tu."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "Nebyla zad叩na po邸tovn鱈 adresa."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "Nebyl zad叩n SMTP server."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "Nebylo zad叩no u転ivatelsk辿 ��鱈slo."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "Nebyl zad叩n POP3 server."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "Nebyl zad叩n IMAP4 server."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "Nebyl zad叩n NNTP server."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6826,36 +6831,36 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Ulo転it jako..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Vytv叩��鱈 novou zpr叩vu"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/P��idat odes鱈latele do data_b叩ze adres"
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Spole��n叩 adresa"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Webov箪 prohl鱈転e��"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6864,7 +6869,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index e8476e6c..0f9edff8 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -18,198 +18,198 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "L脱s konfiguration for hver konto...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 forbindelse til %s blev afbrudt. Forbinder...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP server sti."
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "erstelle IMAP4-Verbindung zu %s:%d ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "Kan ikke starte TLS session.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Sletter meddelelse %d"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Sender meddelelse (%d / %d bytes)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Flytter meddelelse %s%c%d til %s ...\n"
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopierer meddelelse %s%c%d til %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Modtager meddelelse fra %s..."
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kan ikke s脱tte slettede flag: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "kan ikke slette\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Modtager meddelelse fra %s..."
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kan ikke s脱tte slettet flag: 1:%d\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "kan ikke v脱lge mappe %s\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Mark辿ret fil ikke fundet.\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "fejl ved modtagelse af LIST.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "kan ikke oprette '%s'\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "kan ikke oprette '%s'\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan ikke oprette mailbox: LIST fejlet\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "kan ikke oprette mailbox\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan ikke omd淡be mailbox: %s til %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "kan ikke slette mailbox\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "kan ikke modtage kovert\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Sender meddelelse (%d / %d bytes)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "fejl ved modtagelse af kuvert.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kan ikke l脱se kuvert: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "kan ikke modtage namespace\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan ikke v脱lge mappe %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "fejl ved IMAP kommand: CLOSE\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 godkendelse fejlede.\n"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-Login fejlet.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan ikke tilf淡je %s til %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(sender fil...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "kan ikke tilf淡je meddelelse %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan ikke kopiere %s til %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "fejl ved IMAP kommando: STORE %s %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "fejl ved IMAP kommand: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 msgid "error while imap command: CLOSE\n"
 msgstr "fejl ved IMAP kommand: CLOSE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan ikke konvertere UTF-7 til %s\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv can ikke konvertere %s til UTF-7\n"
@@ -296,25 +296,25 @@ msgstr "kan ikke t淡mme mailbox.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Eksporterer meddelelse fra %s til %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "kan ikke kopiere meddelelse %s til %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "Kan ikke 奪bne mark辿ret fil.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "fra og til mappe er ens.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopierer meddelelse %s%c%d til %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -323,7 +323,7 @@ msgstr ""
 "Filen `%s' eksisterer allerede.\n"
 "Kan ikke oprette mappe."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -335,77 +335,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "oprettet NNTP forbindelse til %s:%d ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP forbindelse til %s:%d blev afbrudt. Genforbinder...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "Artikel %d er allerede gemt.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "modtager artikel %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "kann ikke l脱se artikel %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "kan ikke sende artikel.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "kan ikke modtage artikel %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "kan ikke v脱lge gruppe: %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ugyldigt artikel omr奪de: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "ingen nye artikler.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "modtager XOVER %d - %d i %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "kan ikke modtage XOVER\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "fejl ved modtagelse af XOVER.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "ugyldig XOVER linie: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "kan ikke modtage XHDR\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "fejl ved modtagelse af XHDR.\n"
 
@@ -486,7 +486,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "fejl under POP3 session\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "kunne ikke gemme konfiguration til fil\n"
@@ -518,12 +518,12 @@ msgstr "procmime_get_text_content(): Tegns脱t konverteringsfejl.\n"
 msgid "can't open mark file\n"
 msgstr "kan ikke 奪bne mark辿ret fil\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kan ikke hente meddelelse %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Udskrift kommando er ugyldig: `%s'\n"
@@ -691,7 +691,7 @@ msgstr ""
 msgid "Name"
 msgstr "Navn"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -1154,7 +1154,7 @@ msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Mappe"
@@ -1187,7 +1187,7 @@ msgstr "Note"
 msgid "Warning"
 msgstr "Advarsel"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "Fejl"
 
@@ -1743,7 +1743,7 @@ msgstr "MIME type"
 msgid "Size"
 msgstr "St淡rrelse"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "Send"
@@ -1785,7 +1785,7 @@ msgid "Attach file"
 msgstr "Vedh脱ft fil"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "Underskrift"
@@ -1999,7 +1999,7 @@ msgid " Check File "
 msgstr " Check fil "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "Fil"
 
@@ -2077,7 +2077,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2142,7 +2142,7 @@ msgstr "Timeout (sek)"
 msgid "Maximum Entries"
 msgstr "Max. indtastninger"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "Enkelt"
 
@@ -2199,7 +2199,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " V脱lg... "
 
@@ -2355,12 +2355,12 @@ msgstr "Indtast mappe information...\n"
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennems淡ger mappe %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennems淡ger mappe %s ..."
@@ -2634,7 +2634,7 @@ msgstr "Importer LDIF fil til adressebog"
 msgid "Prev"
 msgstr "Forrige"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "N脱ste"
 
@@ -2655,148 +2655,148 @@ msgstr "Slut"
 msgid "Sylpheed: %d new messages"
 msgstr "Hentet (%d nye meddelelse(r))"
 
-#: src/inc.c:388
+#: src/inc.c:433
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Godkender"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "Modtager nu meddelelse"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "Vent"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "Afbrudt"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "Modtager"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hentet (%d meddelelse(r) (%s)"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "Ingen nye meddelelser"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "Forbindelse mislykkedes"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "Godkendelse mislykkedes"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "L奪st"
 
-#: src/inc.c:637
+#: src/inc.c:682
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Hentet (%d nye meddelelse(r))"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "Ingen nye meddelelser"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "Fejl ved hentning af e-post."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "modtager nye meddelelser fra konto %s...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Godkender"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: henter nye meddelelser"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Forbinder til POP3 server: %s ..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ingen forbindelse med POP3 server: %s:%d\n"
 
-#: src/inc.c:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Godkender..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Modtager meddelelse fra %s..."
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Modtager antal nye meddelelser (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Modtager antal nye meddelelser (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Modtager antal nye meddelelser (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "Modtager antal nye meddelelser (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "Sletter meddelelse %d"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "Afslutter"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Modtager meddelelse (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Henter (%d meddelelse(r), (%s) hentet"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 #, fuzzy
 msgid "Connection failed."
 msgstr "Forbindelse mislykkedes"
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 #, fuzzy
 msgid "Error occurred while processing mail."
 msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2805,29 +2805,29 @@ msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "Ingen fri disk plads."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "Kan ikke skrive til fil."
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "Sokkel fejl."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "postkasse er l奪st\n"
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2836,11 +2836,11 @@ msgstr ""
 "Mailbox er l奪st:\n"
 "%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 msgid "Authentication failed."
 msgstr "Godkendelses fejlede."
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2849,16 +2849,16 @@ msgstr ""
 "Godkendelsesfejl:\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 #, fuzzy
 msgid "Session timed out."
 msgstr "tid udl淡bet\n"
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "Hentning afbrudt\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Modtager nye meddelelser fra %s til %s...\n"
@@ -3770,7 +3770,7 @@ msgstr "Hent ny post fra alle konti"
 msgid "Send queued message(s)"
 msgstr "Sender meddelelse(r) i k淡"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Opret"
@@ -3812,62 +3812,62 @@ msgstr "Slet meddelelse"
 msgid "Set as junk mail"
 msgstr "Standard konto"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "Udf淡r"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "Udf淡r mark辿ret process"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "N脱ste ul脱ste"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "Ops脱t"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "Generelt ops脱t"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "Konto indstillinger"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "Afslut"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "Afslut program?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 #, fuzzy
 msgid "Command line options"
 msgstr "Kommando linie ikke opsat."
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Bruges som: %s [OPTION]...\n"
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3883,7 +3883,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4093,223 +4093,228 @@ msgstr ""
 "Forkert adgangss脱tning! Pr淡v igen...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "��bner konti egenskaber...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "Ops脱t af ny konto"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Konto ops脱t"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "Opretter konto egenskaber...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "Modtag"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "Privat"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "Navn p奪 denne konto"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "Standard konto"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "Personlige informationener"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "Fuldt navn"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "E-post adresse"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "Server data"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "Ingen (lokal)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "Dennes server kr脱ver godkendelse"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "Nyheds server"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "Server til modtagelse"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "SMTP server (afsendelse)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "Bruger ID"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "Adgangskode"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Dennes server kr脱ver godkendelse"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "Slet meddelelser fra server efter modtagelse"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "Slet efter"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "dage"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dage: slet straks)"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Hent alle meddelelser fra server"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "Modtagelses st淡rrelse maks."
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "kB"
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "Filtrere meddelelse ved modtagelse"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "Standard indbakke"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Ufiltrerede meddelelser gemmes i denne mappe)"
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "Godkendelses metode"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "Filtrere meddelelse ved modtagelse"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "Nyheder"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr "Max antal artikler ved hentning (0 angiver alle)"
 
-#: src/prefs_account_dialog.c:1024
+#: src/prefs_account_dialog.c:1030
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Mangler modtager"
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Hent alle' henter post fra denne konto"
 
-#: src/prefs_account_dialog.c:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Hoved"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "Tilf淡j dato linie"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "Opret meddelelses ID"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "Tilf淡j bruger defineret hoved"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " Redig辿r... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "Godkendelse"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP godkendelse (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4318,200 +4323,200 @@ msgstr ""
 "Hvis du lader disse v脱re tomme, benyttes\n"
 "samme bruger ID og adgangskode som ved modtagelse."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "Godkend med POP3 f淡r afsendelse"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 msgid "Command output"
 msgstr "Kommando tekst"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Udfyld automatisk f淡lgende adresser"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "Svar til"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "Signer altid meddelelse"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "Krypter altid meddelelser"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "Benyt ASCII format til kodning"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "Benyt klar tekst underskrift"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "Underskrifts n淡gle"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "Benyt standard GnuPg n淡gle"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "V脱lg n淡gle efter e-post adresse"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "Angiv n淡gle manuelt"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "Bruger eller n淡gle ID"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "Benyt ikke SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "Benyt SSL til POP3 forbindelse"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Benyt STARTTLS kommando til at starte SSL session"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "Benyt SSL til IMAP4 forbindelse"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "Benyt SSL til NNTP forbindelse"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "Send (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "Benyt SSL til SMTP forbindelse"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr "Benyt ublokerende SSL"
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 #, 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:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "Angiv SMTP port"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "Angiv POP3 port"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "Angiv IMAP4 port"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "Angiv NNTP port"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "Angiv dom脱ne navn"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "IMAP server sti."
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Hent alle meddelelser fra server"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "Gem sendte meddelelser i"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "Gem kladde i"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Gem slettede meddelelser i"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "Gem slettede meddelelser i"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "Konto navn er ikke angivet."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "E-post adresse ikke angivet."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "SMTP server ikke angivet."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "Bruger ID ikke angivet."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "POP3 server ikke angivet."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 server ikke angivet"
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "NNTP server ikke angivet."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6826,36 +6831,36 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Gem som..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Opret ny meddelelse"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Tilf淡j afsender til adressebo_g"
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Normale adresser"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Web browser"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6864,7 +6869,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 823a9895..9f12061b 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2006-12-09 08:22+0100\n"
 "Last-Translator: Fridtjof Busse <fridtjof@fbunet.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -20,194 +20,194 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Lese alle Einstellungen f端r jeden Account...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-Verbindung zu %s wurde unterbrochen. Verbinde erneut...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP-Server verhindert LOGIN.\n"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "erstelle IMAP4-Verbindung zu %s:%d ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "Kann TLS-Sitzung nicht beginnen.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, c-format
 msgid "Getting message %d"
 msgstr "Hole Nachricht %d"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "H辰nge Nachricht an %s (%d / %d)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Verschiebe Nachrichten %s nach %s ..."
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiere Nachrichten %s nach %s ..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "Entferne Nachrichten von %s..."
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kann gel旦schte Flags nicht setzen: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "kann nicht l旦schen\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Entferne alle Nachrichten in %s..."
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kann gel旦schte Flags nicht setzen: 1:*\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "kann Ablage nicht schlie��en\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "Wurzelverzeichnis %s existiert nicht\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "Fehler beim Empfang von LIST.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Kann '%s' nicht erstellen\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Kann '%s' in INBOX nicht erstellen\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kann Mailbox nicht erstellen: LIST fehlgeschlagen\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "kann Mailbox nicht erstellen\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kann Mailbox %s nicht in %s umbenennen\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "kann Mailbox nicht l旦schen\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "kann die Nachrichteneigenschaften nicht empfangen\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Hole Nachrichtenkopfzeilen (%d / %d bytes)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "Fehler beim Empfang der Nachrichteneigenschaften.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kann die Nachrichteneigenschaften nicht bearbeiten: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Keine Verbindung mit IMAP4-Server: %s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Kann IMAP4-Sitzung mit %s:%d nicht aufbauen\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "kann Namensraum nicht empfangen\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kann Ablage %s nicht ausw辰hlen\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 msgid "error on imap command: STATUS\n"
 msgstr "Fehler beim IMAP-Befehl: STATUS\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4-Beglaubigung fehlgeschlagen.\n"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-Login fehlgeschlagen.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kann %s nicht an %s anh辰ngen\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(Datei versenden...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kann Nachricht nicht anh辰ngen an %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kann %s nicht nach %s kopieren\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Fehler beim IMAP-Befehl: STORE %s %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Fehler beim IMAP-Befehl: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 msgid "error while imap command: CLOSE\n"
 msgstr "Fehler beim IMAP-Befehl: CLOSE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kann UTF-7 nicht nach %s konvertieren\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kann %s nicht nach UTF-7  konvertieren\n"
@@ -294,25 +294,25 @@ msgstr "Kann Mailbox nicht auf null setzen.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportiere Nachrichten von %s in %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "kann Nachricht %s nicht nach %s kopieren\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "Kann markierte Datei nicht 旦ffnen.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "Die Quellablage ist identisch mit dem Ziel.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopiere Nachricht %s%c%d nach %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -321,7 +321,7 @@ msgstr ""
 "Datei '%s' existiert bereits.\n"
 "Kann Ablage nicht erstellen."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -339,77 +339,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "erstelle NNTP-Verbindung zu %s:%d ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP-Verbindung mit %s:%d wurde aufgehoben. Erneut verbinden...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "Artikel %d wurde schon zwischengespeichert.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "empfange Artikel %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "kann Artikel %d nicht lesen\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "kann Artikel nicht senden.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "kann Artikel %d nicht empfangen\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "kann die Gruppe: %s nicht w辰hlen\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ung端ltiger Artikelbereich: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "Keine neuen Artikel.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "bekomme News端bersicht %d - %d in %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "kann News端bersicht nicht bekommen\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "Fehler beim Empfang der News端bersicht.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "ung端ltige News端bersichtszeile: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "kann XHDR nicht bekommen\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "Fehler beim Empfang von XHDR.\n"
 
@@ -487,7 +487,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "Fehler w辰hrend einer POP3-Sitzung\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "konnte nicht in die Konfigurationsdatei schreiben\n"
@@ -517,12 +517,12 @@ msgstr "procmime_get_text_content(): Zeichensatzumsetzung fehlgeschlagen.\n"
 msgid "can't open mark file\n"
 msgstr "kann markierte Datei nicht 旦ffnen\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kann Nachricht %d nicht holen\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Druck-Befehlszeile ist ung端ltig: `%s'\n"
@@ -693,7 +693,7 @@ msgstr ""
 msgid "Name"
 msgstr "Name"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -1158,7 +1158,7 @@ msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Ablage"
@@ -1191,7 +1191,7 @@ msgstr "Notiz"
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "Fehler"
 
@@ -1714,7 +1714,7 @@ msgstr "MIME-Typ"
 msgid "Size"
 msgstr "Gr旦��e"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "Senden"
@@ -1756,7 +1756,7 @@ msgid "Attach file"
 msgstr "Datei anh辰ngen"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "Unterschrift"
@@ -1963,7 +1963,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:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "Datei"
 
@@ -2041,7 +2041,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2106,7 +2106,7 @@ msgstr "Timeout (Sek.)"
 msgid "Maximum Entries"
 msgstr "Eintr辰ge (Max.)"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "Einfach"
 
@@ -2163,7 +2163,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Ausw辰hlen... "
 
@@ -2313,12 +2313,12 @@ msgstr "Setze Ablageinformation...\n"
 msgid "Setting folder info..."
 msgstr "Setze Ablageinformation..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ablage %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ablage %s ..."
@@ -2592,7 +2592,7 @@ msgstr "Importiere LDIF-Datei in Adressbuch"
 msgid "Prev"
 msgstr "Vorherige"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "N辰chste"
 
@@ -2613,142 +2613,142 @@ msgstr "Ende"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d neue Nachricht(en)"
 
-#: src/inc.c:388
+#: src/inc.c:433
 msgid "Authenticating with POP3"
 msgstr "Beglaubigen mit POP3"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "Empfange neue Nachricht"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "Warten"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "Empfange"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Fertig (%d Nachricht(en) (%s) empfangen)"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "Fertig (keine neuen Nachrichten)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "Beglaubigung fehlgeschlagen"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "Blockiert"
 
-#: src/inc.c:637
+#: src/inc.c:682
 msgid "Timeout"
 msgstr "Timeout"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Beendet (%d neue Nachricht(en))"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "Beendet (keine neuen Nachrichten)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "Fehler w辰hrend des Empfanges der E-Mails."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "erhalte neue Nachrichten vom Account %s...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Beglaubigen mit POP3"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Empfange neue Nachrichten"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Verbinde mit POP3-Server: %s..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Keine Verbindung mit POP3-Server: %s:%d\n"
 
-#: src/inc.c:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Beglaubigen..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Erhaltene Nachrichten von %s..."
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "L旦sche Nachricht %d"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "Beenden"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Empfange Nachricht (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Empfange (%d Nachricht(en) (%s) empfangen)"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 msgid "Connection failed."
 msgstr "Verbindung fehlgeschlagen."
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "Fehler beim Verarbeiten der E-Mail."
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2757,28 +2757,28 @@ msgstr ""
 "Fehler beim Verarbeiten der E-Mail:\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "Kein Platz mehr auf der Festplatte."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "Kann Datei nicht schreiben."
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "Socket-Fehler."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr "Verbindung geschlossen vom Remote-Host."
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "Mailbox ist blockiert."
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2787,11 +2787,11 @@ msgstr ""
 "Mailbox ist gesperrt:\n"
 "%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 msgid "Authentication failed."
 msgstr "Beglaubigung fehlgeschlagen."
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2800,15 +2800,15 @@ msgstr ""
 "Beglaubigung fehlgeschlagen:\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr "Sitzungszeit abgelaufen."
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "Empfangen abgebrochen\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Erhalte neue Nachrichten von %s in %s...\n"
@@ -3686,7 +3686,7 @@ msgstr "Neue E-Mail aller Accounts aufnehmen"
 msgid "Send queued message(s)"
 msgstr "Senden wartender Nachrichten"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Verfassen"
@@ -3727,60 +3727,60 @@ msgstr "Nachricht l旦schen"
 msgid "Set as junk mail"
 msgstr "Markiere als Spam-Mail"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "Ausf端hren"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "Markierten Prozess ausf端hren"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "N辰chste ungelesene Nachricht"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "Einstellungen"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "Allgemeine Einstellungen"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "Accounteinstellungen"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr "Sie sind nicht verbunden. W辰hlen sie das Bild zum Verbinden."
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr "Sie sind verbunden. W辰hlen sie das Bild, um die Verbindung zu beenden."
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "Beenden des Programms?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 msgid "Command line options"
 msgstr "Kommandozeilenoptionen"
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Aufruf: sylpheed [OPTION]..."
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3808,7 +3808,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4029,219 +4029,224 @@ msgstr ""
 "Falsches Mantra! Nochmal...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "��ffne Accounteinstellungenfenster...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "Einstellungen eines neuen Accounts"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Accounteinstellungen"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "Erstelle Accounteinstellungenfenster...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "Empfangen"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "Privat"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "Speziell"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "Name dieses Accounts"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "Standard-Account"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "Pers旦nliche Informationen"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "Vollst辰ndiger Name"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "E-Mail-Adresse"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "Serverdaten"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "Keiner (lokal)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "Dieser Server ben旦tigt Beglaubigung"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "Newsserver"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "Server zum Empfangen"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "SMTP-Server (senden)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "Benutzer-ID"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "Kennwort"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 msgid "Use secure authentication (APOP)"
 msgstr "Verwende sichere Beglaubigung (APOP)"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "Nachrichten vom Server nach Empfang l旦schen"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "Entfernen nach"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "Tag(en)"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 msgid "0 days: remove immediately"
 msgstr "0 Tage: sofort entfernen"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Lade alle Nachrichten vom Server herunter"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "Grenze f端r Nachrichteng旦��e beim Empfang"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "Nachrichten beim Empfang filtern"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "Standard Posteingang"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Ungefilterte Nachrichten werden in dieser Ablage gespeichert."
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "Beglaubigungsmethode"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
 msgstr "Pr端fe INBOX nur beim Empfang"
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "Nachrichten beim Empfang filtern"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 msgid "Maximum number of articles to download"
 msgstr "Maximum an herunterzuladenden Artikeln"
 
-#: src/prefs_account_dialog.c:1024
+#: src/prefs_account_dialog.c:1030
 msgid "No limit if 0 is specified."
 msgstr "Ohne Begrenzung, wenn 0 angegeben"
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 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:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Kopfzeilen"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "F端ge Datum in Kopfzeile ein"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "Erzeuge Nachrichten-ID"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "F端ge benutzerdefinierte Kopfzeile ein"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " Bearbeiten... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "Beglaubigung"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-Beglaubigung (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4249,197 +4254,197 @@ msgstr ""
 "Wenn Sie diese Eintr辰ge frei lassen, wird\n"
 "dieselbe ID und dasselbe Passwort wie zum Empfang verwendet."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "Beglaubige mit POP3 vor dem Senden"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 msgid "Command output"
 msgstr "Befehlsausgabe"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Setze folgende Adressen automatisch"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "Nachrichten immer digital unterschreiben"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "Nachrichten immer verschl端sseln"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr "Verschl端ssele beim Antworten auf verschl端sselte Nachricht"
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "Benutze ASCII-H端llen Format zum Verschl端sseln"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "Benutze digitale Klartext-Unterschrift"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "Schl端ssel f端r digitale Unterschrift"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "Benutze voreingestellten GnuPG-Schl端ssel"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "W辰hle Schl端ssel nach E-Mail Adresse"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "Schl端ssel manuell angeben"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "Benutzer- oder Schl端ssel-ID"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "SSL nicht benutzen"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "SSL f端r POP3-Verbindung benutzen"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "F端r SSL-Sitzung STARTTLS-Befehl benutzen"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL f端r IMAP4-Verbindung benutzen"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "SSL f端r NNTP-Verbindung benutzen"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "Senden (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "SSL f端r SMTP-Verbindung benutzen"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr "Benutze non-blocking SSL"
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Ausschalten, wenn Probleme mit der SSL-Verbindung."
 
-#: src/prefs_account_dialog.c:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "SMTP-Port angeben"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "POP3-Port angeben"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "IMAP4-Port angeben"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "NNTP-Port angeben"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "Dom辰nnamen angeben"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "IMAP-Serververzeichnis."
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Nur die Unterablagen dieses Verzeichnisses werden angezeigt."
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 msgid "Clear all message caches on exit"
 msgstr "Alle Nachrichtenzwischenspeicher beim Beenden leeren"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "Gesendete Nachrichten speichern in"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "Entw端rfe speichern in"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 msgid "Put queued messages in"
 msgstr "Nachrichten der Warteschlange speichern in"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "Gel旦schte Nachrichten speichern in"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "Keine Account-Name angegeben."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "Keine E-Mail-Adresse angegeben."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "Keinen SMTP-Server angegeben."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "Keine Benutzer-ID angegeben."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "Keinen POP3-Server angegeben."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "Keinen IMAP4-Server angegeben."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "Keinen NNTP-Server angegeben."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr "Ausgew辰hlte Ablage ist keine Warteschlangen-Ablage."
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6686,31 +6691,31 @@ msgstr ""
 "Der Text konnte nicht angezeigt werden, da das Schreiben in eine tempor辰re "
 "Datei fehlgeschlagen ist. \n"
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 msgid "Sa_ve this image as..."
 msgstr "/Speichere dieses Bild _als..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Neue Nachricht verfassen"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 msgid "Add to address _book..."
 msgstr "Absender in Adress_buch einf端gen"
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 msgid "Copy this add_ress"
 msgstr "Kopiere diese Adresse"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 msgid "_Open with Web browser"
 msgstr "��ffne _mit Internet-Browser"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr "Kopiere diese _Verkn端pfung"
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6723,7 +6728,7 @@ msgstr ""
 "\n"
 "Trotzdem 旦ffnen?"
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr "Falsche URL Warnung"
 
diff --git a/po/el.po b/po/el.po
index c3ba102f..a1583f9a 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2001-10-08\n"
 "Last-Translator: Michalis Kabrianis <Michalis@bigfoot.com>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -18,202 +18,202 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "��旅留硫略龍�� ��旅�� ����慮亮溜��竜旅�� 粒旅留 虜略慮竜 了凌粒留��旅留��亮��...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "�� IMAP4 ����僚隆竜��侶 ����凌 %s:%d 隆旅留虜����侶虜竜. ����留僚留����僚隆竜��侶...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "��留��略了凌粒凌�� ����凌僚 竜両����侶��劉��侶 IMAP4"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "隆侶亮旅凌����粒溜留 IMAP4 ����僚隆竜��侶�� ����凌 %s:%d ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr ""
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "��旅留粒��略���� ��凌 亮流僚��亮留"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "裡��劉了僚�� ��凌 亮流僚��亮留 (%d / %d bytes)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "��竜��留虜旅僚�� ��凌 亮流僚��亮留  %s%c%d ����凌 %s ...\n"
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "��僚��旅粒��略���� ��凌 亮流僚��亮留 %s%c%d ����凌 %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "��留亮硫略僚�� ��留 亮侶僚��亮留��留 留���� ��凌 %s ����凌 %s...\n"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "隆竜僚 亮��凌���� 僚留 ��留 ��侶亮竜旅�ﾏ��� ���� 隆旅竜粒��留亮亮劉僚留: %d\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "隆竜僚 亮��凌���� 僚留 ��留 留��留了竜溜����\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "��留亮硫略僚�� ��留 亮侶僚��亮留��留 留���� ��凌 %s ����凌 %s...\n"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "隆竜僚 亮��凌���� 僚留 ��留 ��侶亮竜旅�ﾏ��� ���� 隆旅竜粒��留亮亮劉僚留: 1:%d\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "隆竜僚 亮��凌���� 僚留 竜��旅了劉両�� ��凌僚 虜留��略了凌粒凌: %s\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "里凌 留����竜溜凌 ��侶亮略僚��竜��僚 隆竜僚 硫��劉慮侶虜竜.\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "����僚劉硫侶 ����略了亮留 虜留慮�ﾏ� 了略亮硫留僚留 LIST.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, fuzzy, c-format
 msgid "Can't create '%s'\n"
 msgstr "隆竜僚 亮��凌���� 僚留 隆侶亮旅凌����粒流���� %s\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, fuzzy, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "隆竜僚 亮��凌���� 僚留 隆侶亮旅凌����粒流���� %s\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "隆竜僚 亮��凌���� 僚留 隆侶亮旅凌����粒流���� ��凌 mailbox: 侶 LIST 留��劉������竜\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "隆竜僚 亮��凌���� 僚留 隆侶亮旅凌����粒流���� ��凌 mailbox\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, fuzzy, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "隆竜僚 亮��凌���� 僚留 隆侶亮旅凌����粒流���� ��凌 mailbox\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "隆竜僚 亮��凌���� 僚留 隆旅留粒��略���� ��凌 mailbox\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "隆竜僚 亮��凌���� 僚留 了略硫�� ��凌僚 ��略虜竜了凌\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "裡��劉了僚�� ��凌 亮流僚��亮留 (%d / %d bytes)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "����僚劉硫侶 ����略了亮留 虜留慮�ﾏ� 了略亮硫留僚留 ��凌僚 ��略虜竜了凌.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "隆竜僚 亮��凌���� 僚留 隆旅留硫略���� ��凌僚 ��略虜竜了凌: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "��竜僚 亮��凌���� 僚留 ����僚隆竜慮�� ����凌僚 IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, fuzzy, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "��竜僚 亮��凌���� 僚留 ����僚隆竜慮�� ����凌僚 IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr ""
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "隆竜僚 亮��凌���� 僚留 竜��旅了劉両�� ��凌僚 虜留��略了凌粒凌: %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "����略了亮留 虜留��略 ��侶僚 竜僚��凌了流 imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "��旅����凌��凌溜侶��侶"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "�� 竜溜��凌隆凌�� ����凌 IMAP4 留��劉������竜.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "隆竜僚 亮��凌���� 僚留 ����凌��慮劉���� ��凌 %s ����凌 %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 #, fuzzy
 msgid "(sending file...)"
 msgstr "裡��劉了僚�� DATA..."
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "隆竜僚 亮��凌���� 僚留 ����凌��慮劉���� ��凌 亮流僚��亮留 %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "隆竜僚 亮��凌���� 僚留 留僚��旅粒��略���� ��凌 %d ����凌 %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "����略了亮留 虜留��略 ��侶僚 竜僚��凌了流 imap: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "����略了亮留 虜留��略 ��侶僚 竜僚��凌了流 imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "����略了亮留 虜留��略 ��侶僚 竜僚��凌了流 imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr ""
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
@@ -298,25 +298,25 @@ msgstr "隆竜僚 亮��凌���� 僚留 亮侶隆竜僚溜���� ��凌 mailbox.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "��両留粒��粒流 亮侶僚��亮略����僚 留���� %s ����凌�� %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "隆竜僚 亮��凌���� 僚留 留僚��旅粒��略���� ��凌 亮流僚��亮留 %s ����凌 %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "��竜僚 亮��凌���� 僚留 留僚凌溜両�� ��侶亮竜旅��亮劉僚凌 留����竜溜凌.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "凌 ��侶粒留溜凌�� 虜留��略了凌粒凌�� 竜溜僚留旅 溜隆旅凌�� 亮竜 ��凌僚 虜留��略了凌粒凌 ����凌凌��旅��亮凌��.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "��僚��旅粒��略���� ��凌 亮流僚��亮留 %s%c%d ����凌 %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -325,7 +325,7 @@ msgstr ""
 "里凌 留����竜溜凌 `%s' ����略����竜旅 流隆侶.\n"
 "��竜僚 亮��凌���� 僚留 隆侶亮旅凌����粒流���� ��凌僚 虜留��略了凌粒凌."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -337,77 +337,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "隆侶亮旅凌����粒�� NNTP ����僚隆竜��侶 ����凌 %s:%d ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "�� NNTP ����僚隆竜��侶 ����凌 %s:%d 隆旅留虜����侶虜竜. ����留僚留����僚隆竜��侶...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "��凌 略��慮��凌 %d 劉��竜旅 ����凌����竜了留����竜溜 流隆侶.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "了留亮硫略僚�� ��凌 略��慮��凌 %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "隆竜僚 亮��凌���� 僚留 隆旅留硫略���� ��凌 略��慮��凌 %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "隆竜僚 亮��凌���� 僚留 ����竜溜了�� ��凌 略��慮��凌.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "隆竜僚 亮��凌���� 僚留 了略硫�� ��凌 略��慮��凌 %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "隆竜僚 亮��凌���� 僚留 竜��旅了劉両�� ��侶僚 凌亮略隆留 %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "亮侶 劉粒虜����侶 留虜凌了凌��慮溜留 略��慮����僚: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "隆竜僚 ����略����凌��僚 僚劉留 略��慮��留.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "了留亮硫略僚�� xover %d - %d ����凌 %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "隆竜僚 亮��凌���� 僚留 了略硫�� xover\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "����僚劉硫侶 ����略了亮留 虜留慮�ﾏ� 了略亮硫留僚留 xover.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "亮侶 劉粒虜����侶 粒��留亮亮流 xover: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "隆竜僚 亮��凌���� 僚留 了略硫�� xhdr\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "����僚劉硫侶 ����略了亮留 虜留慮�ﾏ� 了略亮硫留僚留 xhdr.\n"
 
@@ -490,7 +490,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "����凌劉虜����竜 ����略了亮留 ����侶僚 竜両留虜��溜硫����侶\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "留��劉������留 僚留 粒��略���� ��旅�� ����慮亮溜��竜旅�� ����凌 留����竜溜凌\n"
@@ -523,12 +523,12 @@ msgstr "�� 亮竜��留����凌��流 ��凌�� 虜�ﾎ肝肯採� 留��劉������竜.\n"
 msgid "can't open mark file\n"
 msgstr "隆竜僚 亮��凌���� 僚留 留僚凌溜両�� ��凌 留����竜溜凌 mark\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "隆竜僚 亮��凌���� 僚留 了略硫�� ��凌 亮流僚��亮留 %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "�� 竜僚��凌了流 竜虜����������侶�� 竜溜僚留旅 略虜����侶: `%s'\n"
@@ -701,7 +701,7 @@ msgstr ""
 msgid "Name"
 msgstr "��僚凌亮留"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "����������虜凌了了凌"
 
@@ -1162,7 +1162,7 @@ msgid "Group"
 msgstr "��劉留��亮略隆留"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "��留��略了凌粒凌��"
@@ -1197,7 +1197,7 @@ msgstr "裡侶亮竜溜����侶"
 msgid "Warning"
 msgstr "����凌竜旅隆凌��凌溜侶��侶"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "裡��略了亮留"
 
@@ -1764,7 +1764,7 @@ msgstr "������凌�� MIME"
 msgid "Size"
 msgstr "��劉粒竜慮凌��"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "����凌����凌了流"
@@ -1808,7 +1808,7 @@ msgid "Attach file"
 msgstr "����凌��略����侶��侶 留����竜溜凌��"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "Y��凌粒��留��流"
@@ -2028,7 +2028,7 @@ msgid " Check File "
 msgstr " ��了竜粒��凌�� ������竜溜凌�� "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "������竜溜凌"
 
@@ -2108,7 +2108,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2174,7 +2174,7 @@ msgstr ""
 msgid "Maximum Entries"
 msgstr "��劉粒旅����凌�� 留��旅慮亮���� 竜粒粒��留���ﾎ�"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "��留��旅虜略"
 
@@ -2235,7 +2235,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "����旅了凌粒流... "
 
@@ -2397,12 +2397,12 @@ msgstr "��劉���� ��旅�� ��了侶��凌��凌��溜竜�� 虜留��留了��粒��僚...\n"
 msgid "Setting folder info..."
 msgstr "��劉���� ��旅�� ��了侶��凌��凌��溜竜�� 虜留��留了��粒��僚..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "裡略������侶 虜留��留了��粒��僚 %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "裡略������侶 虜留��留了��粒凌�� %s ..."
@@ -2691,7 +2691,7 @@ msgstr ""
 msgid "Prev"
 msgstr "����旅了凌粒劉��"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "������亮竜僚凌"
 
@@ -2713,206 +2713,206 @@ msgstr ""
 msgid "Sylpheed: %d new messages"
 msgstr "\t%d 僚劉凌(留) 亮流僚��亮留(亮侶僚��亮留��留)\n"
 
-#: src/inc.c:388
+#: src/inc.c:433
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "��旅����凌��凌溜侶��侶"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "��留亮硫略僚�� ��留 僚劉留 亮侶僚��亮留��留"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "��竜��旅亮劉僚��"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "��虜�����ﾎ故稽採�"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "��留亮硫略僚��"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, fuzzy, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "��旅留粒��留��流 亮侶僚��亮略����僚 留���� ��凌僚 竜両����侶��劉��侶 ����留僚 ��留��留了侶��慮凌��僚"
 
-#: src/inc.c:615
+#: src/inc.c:660
 #, fuzzy
 msgid "Done (no new messages)"
 msgstr "��竜僚 ����略����凌��僚 留隆旅略硫留����留 亮侶僚��亮留��留"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "�� ����僚隆竜��侶 留��劉������竜"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "H ��旅����凌��凌溜侶��侶 留��劉������竜"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:637
+#: src/inc.c:682
 msgid "Timeout"
 msgstr ""
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, fuzzy, c-format
 msgid "Finished (%d new message(s))"
 msgstr "\t%d 僚劉凌(留) 亮流僚��亮留(亮侶僚��亮留��留)\n"
 
-#: src/inc.c:690
+#: src/inc.c:735
 #, fuzzy
 msgid "Finished (no new messages)"
 msgstr "��竜僚 ����略����凌��僚 留隆旅略硫留����留 亮侶僚��亮留��留"
 
-#: src/inc.c:699
+#: src/inc.c:744
 #, fuzzy
 msgid "Some errors occurred while getting mail."
 msgstr "����僚劉硫侶 ����略了亮留 虜留慮�ﾏ� 了略亮硫留僚留 ��侶僚 留了了侶了凌粒��留��溜留."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "了留亮硫略僚�� 僚劉留 亮侶僚��亮留��留 ��凌�� 了凌粒留��旅留��亮凌�� %s...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "��旅����凌��凌溜侶��侶"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: ��留亮硫略僚�� ��留 僚劉留 亮侶僚��亮留��留"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "裡��僚隆劉凌亮留旅 ����凌僚 POP3 server: %s ..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "��竜僚 亮��凌���� 僚留 ����僚隆竜慮�� ����凌僚 POP3 server: %s:%d\n"
 
-#: src/inc.c:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "��旅����凌��凌溜侶��侶"
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "��留亮硫略僚�� ��留 亮侶僚��亮留��留 留���� ��凌 %s ����凌 %s...\n"
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "��留亮硫略僚�� ��凌僚 留��旅慮亮�� ����僚 僚劉��僚 亮侶僚��亮略����僚 (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "��留亮硫略僚�� ��凌僚 留��旅慮亮�� ����僚 僚劉��僚 亮侶僚��亮略����僚 (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "��留亮硫略僚�� ��凌僚 留��旅慮亮�� ����僚 僚劉��僚 亮侶僚��亮略����僚 (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "��留亮硫略僚�� ��凌 亮劉粒竜慮凌�� ����僚 亮侶僚��亮略����僚 (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, fuzzy, c-format
 msgid "Deleting message %d"
 msgstr "��旅留粒��略���� ��凌 亮流僚��亮留"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "��了竜溜僚�� ��侶 ����僚隆竜��侶"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "��留亮硫略僚�� ��凌 亮流僚��亮留 (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "��旅留粒��留��流 亮侶僚��亮略����僚 留���� ��凌僚 竜両����侶��劉��侶 ����留僚 ��留��留了侶��慮凌��僚"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 #, fuzzy
 msgid "Connection failed."
 msgstr "�� ����僚隆竜��侶 留��劉������竜"
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "��僚留 ����略了亮留 ����僚劉硫侶 虜留慮�ﾏ� 竜��竜両竜��粒略龍凌亮留旅 ��凌 mail."
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "��僚留 ����略了亮留 ����僚劉硫侶 虜留慮�ﾏ� 竜��竜両竜��粒略龍凌亮留旅 ��凌 mail."
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "��竜僚 ����略����竜旅 略了了凌�� ���ﾏ�凌�� ����凌 隆溜��虜凌."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 #, fuzzy
 msgid "Can't write file."
 msgstr "��竜僚 亮��凌���� 僚留 粒��略���� ��竜 留����竜溜凌.\n"
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 #, fuzzy
 msgid "Socket error."
 msgstr "����略了亮留 ��������凌虜��了了凌��\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "痢��慮亮溜��竜旅�� Mailbox"
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "痢��慮亮溜��竜旅�� Mailbox"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 #, fuzzy
 msgid "Authentication failed."
 msgstr "��旅����凌��凌溜侶��侶"
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "��旅����凌��凌溜侶��侶"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 #, fuzzy
 msgid "Incorporation cancelled\n"
 msgstr "��流��侶 僚劉凌�� mail"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "��留亮硫略僚�� 僚劉留 亮侶僚��亮留��留 留���� ��凌 %s ����凌 %s...\n"
@@ -3898,7 +3898,7 @@ msgstr "��流��侶 僚劉凌�� mail 留���� ��了凌���� ��凌���� 了凌粒留��旅留��亮凌��
 msgid "Send queued message(s)"
 msgstr "����凌����凌了流 ��了��僚 ����僚 亮侶僚��亮略����僚 留���� ��侶僚 凌����略"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "裡��僚慮竜��侶"
@@ -3942,63 +3942,63 @@ msgstr "��旅留粒��留��流 亮侶僚��亮留��凌��"
 msgid "Set as junk mail"
 msgstr " ��劉��竜 ���� ����僚侶慮侶 了凌粒留��旅留��亮�� "
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "��虜��劉了竜��侶"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "��虜��劉了竜��侶 ��侶亮竜旅��亮劉僚侶�� 竜��粒留��溜留��"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "������亮竜僚凌 留隆旅略硫留����凌 亮流僚��亮留"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "����旅了凌粒劉��"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 #, fuzzy
 msgid "Common preferences"
 msgstr "��凌旅僚劉�� ����旅了凌粒劉��"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "��凌粒/��亮����"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "痢��慮亮溜��竜旅�� 了凌粒留��旅留��亮凌��"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "��両凌隆凌��"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "��両凌隆凌�� 留���� 留������ ��凌 ������粒��留亮亮留;"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 #, fuzzy
 msgid "Command line options"
 msgstr "里凌 ��僚凌亮留 ��侶�� 虜竜��留了溜隆留�� 隆竜僚 劉��竜旅 凌��旅����竜溜."
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "律��流��侶: %s [��������������]...\n"
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4014,7 +4014,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4229,439 +4229,444 @@ msgstr ""
 "��略慮凌�� 虜��隆旅虜流 ����略��侶! ��留僚留����凌����留慮流����竜...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "��僚凌溜粒�� ��凌 ��留��略慮����凌 竜��旅了凌粒�ﾎ� ����僚 了凌粒留��旅留��亮�ﾎ�...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "��凌粒留��旅留��亮����%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "����旅了凌粒劉�� 粒旅留 ��凌 僚劉凌 了凌粒留��旅留��亮��"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 #, fuzzy
 msgid "Account preferences"
 msgstr "��凌旅僚劉�� ����旅了凌粒劉��"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "��侶亮旅凌����粒�� ��凌 ��留��略慮����凌 竜��旅了凌粒�ﾎ� ��凌�� 了凌粒留��旅留��亮凌��...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "��流��侶"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "��������旅虜����侶��留"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "����凌������侶亮劉僚留"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "��僚凌亮留 ��凌�� 了凌粒留��旅留��亮凌��"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 #, fuzzy
 msgid "Set as default"
 msgstr " ��劉��竜 ���� ����僚侶慮侶 了凌粒留��旅留��亮�� "
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "����凌������旅虜劉�� ��了侶��凌��凌��溜竜��"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "��了流��竜�� ��僚凌亮留"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "��旅竜��慮��僚��侶 mail"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "����粒留僚旅��亮����"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "��了侶��凌��凌��溜竜�� 竜両����侶��劉��侶"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "��劉留 (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "里溜��凌��留 (��凌��旅虜��)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "���������� 凌 竜両����侶��劉��侶�� 留��留旅��竜溜 ��旅����凌��凌溜侶��侶"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "��両����侶��劉��侶�� 僚劉��僚"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "��両����侶��劉��侶�� 粒旅留 了流��侶"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "��両����侶��劉��侶�� SMTP (留��凌����凌了流)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "��僚凌亮留 ����流����侶"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "����隆旅虜����"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "���������� 凌 竜両����侶��劉��侶�� 留��留旅��竜溜 ��旅����凌��凌溜侶��侶"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "��旅留粒��留��流 亮侶僚��亮略����僚 留���� ��凌僚 竜両����侶��劉��侶 ����留僚 ��留��留了侶��慮凌��僚"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 #, fuzzy
 msgid "Remove after"
 msgstr "����留溜��竜��侶 虜留��留了��粒凌��"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 #, fuzzy
 msgid "days"
 msgstr "��略僚��留"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 msgid "0 days: remove immediately"
 msgstr ""
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "��流��侶 ��了��僚 ����僚 亮侶僚��亮略����僚 留���� ��凌僚 竜両����侶��劉��侶"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 #, fuzzy
 msgid "Receive size limit"
 msgstr "��亮��略僚旅��侶 隆旅留了��粒凌�� 了流��侶��"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "陸旅了����略��旅��亮留 亮侶僚��亮略����僚 虜留��略 ��侶僚 了流��侶"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 #, fuzzy
 msgid "Default inbox"
 msgstr "����凌虜留慮凌��旅��亮劉僚凌 虜了竜旅隆溜 ����凌粒��留��流��"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr ""
 "��僚凌旅粒亮留 ��凌�� �����ﾏ�凌�� 留隆旅略硫留����凌�� 亮侶僚��亮留��凌�� 虜留��略 ��侶 亮竜��留虜溜僚侶��侶 ��竜 劉僚留 虜留��略了凌粒凌"
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 #, fuzzy
 msgid "Authentication method"
 msgstr "��旅����凌��凌溜侶��侶"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "��������亮留��侶"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "陸旅了����略��旅��亮留 亮侶僚��亮略����僚 虜留��略 ��侶僚 了流��侶"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "��劉留"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "��劉粒旅����凌�� 留��旅慮亮���� 略��慮����僚 ��凌�� 慮留 了侶��慮凌��僚\n"
 "(������溜�� ����旅凌 留僚 慮劉��竜��竜 0)"
 
-#: src/prefs_account_dialog.c:1024
+#: src/prefs_account_dialog.c:1030
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "�� ��留��留了流����侶�� 隆竜僚 劉��竜旅 凌��旅����竜溜."
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 #, fuzzy
 msgid "`Get all' checks for new messages on this account"
 msgstr "`��流��侶 ��了��僚' 竜了劉粒��竜旅 粒旅留 僚劉留 亮侶僚��亮留��留 ��竜 留������ ��凌 了凌粒留��旅留��亮��"
 
-#: src/prefs_account_dialog.c:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "����旅虜竜��留了溜隆留"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "����凌��慮流虜侶 ��竜隆溜凌�� 侶亮竜��凌亮侶僚溜留�� ����侶僚 虜竜��留了溜隆留"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "��侶亮旅凌����粒溜留 Message-ID"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "����凌��慮流虜侶 虜竜��留了溜隆留�� 凌��旅��亮劉僚侶�� 留���� ��凌僚 ����流����侶"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr "����竜両竜��粒留��溜留..."
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "��旅����凌��凌溜侶��侶"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "��旅����凌��凌溜侶��侶 SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "��旅����凌��凌溜侶��侶 亮竜 POP3 ����旅僚 ��侶僚 留��凌����凌了流"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 #, fuzzy
 msgid "Command output"
 msgstr "��僚��凌了流"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 #, fuzzy
 msgid "Automatically set the following addresses"
 msgstr "��������亮留��凌�� 凌��旅��亮���� 留�����ﾎ� ����僚 隆旅竜��慮��僚��竜��僚"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "��凌旅僚凌��凌溜侶��侶"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "����略僚��侶��侶 ��竜"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "離��凌粒��留��流 亮侶僚��亮略����僚 竜両 凌��旅��亮凌��"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "����������凌粒��略��侶��侶 亮侶僚��亮略����僚 竜両 凌��旅��亮凌��"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 #, fuzzy
 msgid "Use clear text signature"
 msgstr "��旅��留粒��粒流 ����凌粒��留��流��"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "��了竜旅隆溜 ����凌粒��留��流��"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "律流��侶 ����凌虜留慮凌��旅��亮劉僚凌�� 虜了竜旅隆旅凌�� GnuPG"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "����旅了凌粒流 虜了竜旅隆旅凌�� 亮竜 硫略��侶 ��侶僚 email 隆旅竜��慮��僚��侶"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "����溜����竜 亮竜 ��凌 ��劉��旅 ��凌 虜了竜旅隆溜"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "律��流����侶�� 流 key ID:"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "��留 亮侶僚 ����侶��旅亮凌��凌旅竜溜��留旅 SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "律��流��侶 SSL 粒旅留 ����僚隆竜��侶 POP3"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "律��流��侶 竜僚��凌了流�� STARTTLS 粒旅留 ��侶僚 劉僚留��両侶 留����留了凌���� (SSL) ����僚��隆凌��"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "律��流��侶 SSL 粒旅留 ����僚隆竜��侶 IMAP4"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 #, fuzzy
 msgid "Use SSL for NNTP connection"
 msgstr "律��流��侶 SSL 粒旅留 ����僚隆竜��侶 SMTP"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "����凌����凌了流 (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "律��流��侶 SSL 粒旅留 ����僚隆竜��侶 SMTP"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "����凌��隆旅凌��旅��亮���� 慮����留�� SMTP"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "����凌��隆旅凌��旅��亮���� 慮����留�� POP3"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "����凌��隆旅凌��旅��亮���� 慮����留�� IMAP4"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "����凌��隆旅凌��旅��亮���� 慮����留�� NNTP"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "����旅��亮���� ��凌�� 凌僚��亮留��凌�� ��凌�� domain"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "��留��略了凌粒凌�� ����凌僚 竜両����侶��劉��侶 IMAP4"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "��流��侶 ��了��僚 ����僚 亮侶僚��亮略����僚 留���� ��凌僚 竜両����侶��劉��侶"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 #, fuzzy
 msgid "Put sent messages in"
 msgstr "����凌慮流虜竜����侶 ����留了亮劉僚��僚 亮侶僚��亮略����僚 ����凌 outbox"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 #, fuzzy
 msgid "Put draft messages in"
 msgstr "里��了旅両侶 亮侶僚��亮略����僚 ����凌����"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "��旅留粒��留��流 亮侶僚��亮留��凌��"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 #, fuzzy
 msgid "Put deleted messages in"
 msgstr "��旅留粒��留��流 亮侶僚��亮留��凌��"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 #, fuzzy
 msgid "Account name is not entered."
 msgstr "�� 隆旅竜��慮��僚��侶 mail 隆竜僚 劉��竜旅 凌��旅����竜溜."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "�� 隆旅竜��慮��僚��侶 mail 隆竜僚 劉��竜旅 凌��旅����竜溜."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "�� 竜両����侶��劉��侶�� SMTP 隆竜僚 劉��竜旅 凌��旅����竜溜."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "里凌 ��僚凌亮留 ����流����侶 隆竜僚 劉��竜旅 凌��旅����竜溜."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "�� 竜両����侶��劉��侶�� POP3 隆竜僚 劉��竜旅 凌��旅����竜溜."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "�� 竜両����侶��劉��侶�� IMAP4 隆竜僚 劉��竜旅 凌��旅����竜溜."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "�� 竜両����侶��劉��侶�� NNTP 隆竜僚 劉��竜旅 凌��旅����竜溜."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6997,35 +7002,35 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/����凌慮流虜竜����侶 ����..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "裡��僚慮竜��侶 僚劉凌�� 亮侶僚��亮留��凌��"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/����凌��慮流虜侶 留��凌����凌了劉留 ����凌僚 虜留��略了凌粒凌 隆旅竜��慮��僚��竜��僚"
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "��凌旅僚劉�� 隆旅竜��慮��僚��竜旅��"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 msgid "_Open with Web browser"
 msgstr ""
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7034,7 +7039,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index cf26c0fe..96f145bc 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2006-12-02 13:12+0100\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -18,194 +18,194 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Leyendo configuraci坦n de cada cuenta...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La conexi坦n IMAP4 con %s se ha roto. Reconectando...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "El servidor IMAP4 deshabilita LOGIN.\n"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "creando conexi坦n IMAP4 con %s:%d ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "No puedo iniciar la sesi坦n TLS.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, c-format
 msgid "Getting message %d"
 msgstr "Obteniendo mensaje %d"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Agregando mensajes a %s (%d / %d)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Moviendo mensajes %s a %s ..."
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiando mensajes %s a %s ..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "Borrando mensajes %s"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "no puedo establecer los flags borrados: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "no puedo vaciar\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Borrando todos los mensajes en %s"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "no puedo establecer los flags borrados: 1:*\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "no se puede cerrar la carpeta\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "la carpeta ra鱈z %s no existe\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "hubo un error obteniendo LIST.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "No puedo crear 束%s損\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "No puedo crear 束%s損 bajo Entrada\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no puedo crear el buz坦n: LIST fall坦\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "no puedo crear el buz坦n\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "no puedo renombrar el buz坦n: %s a %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "no puedo borrar el buz坦n\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "no se puede obtener la estructura del mensaje\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Obteniendo las cabeceras de mensaje (%d / %d)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "error obteniendo la estructura del mensaje.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "No se puede interpretar la estructura del mensaje: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "No se puede conectar con el servidor IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "No puedo establecer la sesi坦n IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "no se puede obtener el espacio de nombres\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "no se puede seleccionar la carpeta: %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 msgid "error on imap command: STATUS\n"
 msgstr "error en el mandato imap: STATUS\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 msgid "IMAP4 authentication failed.\n"
 msgstr "La autentificaci坦n IMAP fall坦.\n"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificaci坦n IMAP4 fallida.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "no puedo a単adir %s a %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(enviando fichero...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "no se puede a単adir el mensaje a %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "no puedo copiar %s a %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "error en el mandato imap: STORE %s %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "error en el mandato imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 msgid "error while imap command: CLOSE\n"
 msgstr "error en el mandato imap: CLOSE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv no puede convertir UTF-7 a %s\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv no puede convertir %s a UTF-7\n"
@@ -292,25 +292,25 @@ msgstr "no se puede truncar a cero el buz坦n.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportando mensajes de %s a %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "no se puede copiar mensaje %s a %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "No se puede abrir el fichero de marcas.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "las carpetas de origen y destino son id辿nticas.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copiando mensaje %s%c%d a %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -319,7 +319,7 @@ msgstr ""
 "El fichero 束%s損 ya existe.\n"
 "No puedo crear la carpeta."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -338,77 +338,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "creando conexi坦n NNTP con %s:%d ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "La conexi坦n NNTP con %s:%d ha sido rota. Reconectando...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "el art鱈culo %d ya esta en cach辿.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "obteniendo art鱈culo %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "no puedo leer el art鱈culo %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "no se puede enviar el art鱈culo.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "no puedo recuperar el art鱈culo %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "no puedo seleccionar el grupo: %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "rango de art鱈culos no v叩lido: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "no hay art鱈culos nuevos.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obteniendo xover %d - %d en %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "no se puede obtener xover\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "hubo un error obteniendo xover.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "l鱈nea xover no v叩lida: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "no se puede obtener xhdr\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "hubo un error obteniendo xhdr.\n"
 
@@ -486,7 +486,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "hubo alg炭n error en la sesi坦n POP3\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "fallo escribiendo la configuraci坦n al fichero\n"
@@ -516,12 +516,12 @@ msgstr "procmime_get_text_content(): Conversi坦n de c坦digos fallida.\n"
 msgid "can't open mark file\n"
 msgstr "no se puede abrir el fichero de marcas\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "no se puede obtener el mensaje %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La orden para imprimir es inv叩lida: 束%s損\n"
@@ -691,7 +691,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nombre"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -1155,7 +1155,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Carpeta"
@@ -1188,7 +1188,7 @@ msgstr "Notificaci坦n"
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "Error"
 
@@ -1708,7 +1708,7 @@ msgstr "Tipo MIME"
 msgid "Size"
 msgstr "Tama単o"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "Enviar"
@@ -1750,7 +1750,7 @@ msgid "Attach file"
 msgstr "Adjuntar fichero"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "Firma"
@@ -1957,7 +1957,7 @@ msgid " Check File "
 msgstr " Comprobar fichero "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "Fichero"
 
@@ -2035,7 +2035,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2100,7 +2100,7 @@ msgstr "Tiempo l鱈mite (seg.)"
 msgid "Maximum Entries"
 msgstr "N尊 m叩ximo de entradas"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "B叩sico"
 
@@ -2159,7 +2159,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Seleccionar..."
 
@@ -2309,12 +2309,12 @@ msgstr "Estableciendo la informaci坦n de la carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Estableciendo la informaci坦n de la carpeta..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -2587,7 +2587,7 @@ msgstr "Importar fichero LDIF a la agenda"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "Siguiente"
 
@@ -2608,143 +2608,143 @@ msgstr "Finalizar"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d mensajes nuevos"
 
-#: src/inc.c:388
+#: src/inc.c:433
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autentificando"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "Obteniendo nuevos mensajes"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hecho (%d mensaje(s) (%s) recibido(s))"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "Hecho (no hay mensajes nuevos)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "Conexi坦n fallida"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "Authorizaci坦n fallida"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:637
+#: src/inc.c:682
 msgid "Timeout"
 msgstr "Tiempo l鱈mite"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finalizado (%d mensaje(s) nuevo(s))"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "Finalizado (no hay mensajes nuevos)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "Hubo alg炭n error obteniendo el correo."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obteniendo nuevos mensajes de la cuenta %s...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autentificando"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando nuevos mensajes"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando al servidor POP3: %s..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "No se puede conectar al servidor POP3: %s:%d\n"
 
-#: src/inc.c:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Autentificando..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obteniendo mensajes desde %s..."
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obteniendo el n炭mero de nuevos mensajes (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obteniendo el n炭mero de nuevos mensajes (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obteniendo el n炭mero de nuevos mensajes (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obteniendo el tama単o de nuevos mensajes (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "Borrando mensaje %d"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "Saliendo"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaje (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Obteniendo (%d mensaje(s) (%s) recibido(s))"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 msgid "Connection failed."
 msgstr "Conexi坦n fallida."
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "Hubo un error mientras se procesaba el correo."
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2753,28 +2753,28 @@ msgstr ""
 "Hubo un error procesando el correo:\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "No hay espacio libre en disco."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "No se puede escribir el fichero."
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "Error de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr "Conexi坦n cerrada por la m叩quina remota."
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "El buz坦n esta bloqueado."
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2783,11 +2783,11 @@ msgstr ""
 "El buz坦n est叩 bloqueado:\n"
 "%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 msgid "Authentication failed."
 msgstr "La autentificaci坦n fall坦."
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2796,15 +2796,15 @@ msgstr ""
 "La autentificaci坦n fall坦:\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr "Se agot坦 el tiempo de espera de la sesi坦n."
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "Incorporaci坦n cancelada\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obteniendo nuevos mensajes desde %s en %s...\n"
@@ -3683,7 +3683,7 @@ msgstr "Incorporar correo nuevo de todas las cuentas"
 msgid "Send queued message(s)"
 msgstr "Enviar mensaje(s) en la cola"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Componer"
@@ -3724,60 +3724,60 @@ msgstr "Borrar el mensaje"
 msgid "Set as junk mail"
 msgstr "Es correo basura"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "Ejecutar"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "Ejecutar el proceso marcado"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "Siguiente no le鱈do"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "Preferencias"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "Preferencias comunes"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Cuenta"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "Preferencias de la cuenta"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr "Esta desconectado. Haga click en el icono para conectar."
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr "Esta conectado. Haga click en el icono para desconectar."
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "多Salir del programa?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 msgid "Command line options"
 msgstr "Opciones de l鱈nea de ordenes"
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPCI��N]..."
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3805,7 +3805,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4026,218 +4026,223 @@ msgstr ""
 "臓Contrase単a err坦nea! Intentelo de nuevo...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "Abriendo ventana de preferencias de cuenta...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "Cuenta%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "Preferencias para una nueva cuenta"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Preferencias de la cuenta"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "Creando ventana de preferencias de cuenta...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "Avanzadas"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "Nombre de esta cuenta"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "Cuenta por defecto"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "Informaci坦n personal"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "Nombre completo"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "Direcci坦n de correo"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "Organizaci坦n"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "Informaci坦n del servidor"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "Noticias (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "Ninguna (local)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "Este servidor requiere autentificaci坦n"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "Servidor de noticias"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "Servidor de recepci坦n"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "Usuario"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "Contrase単a"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 msgid "Use secure authentication (APOP)"
 msgstr "Usar autentificaci坦n segura (APOP)"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "Eliminar los mensajes del servidor al recibir"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "Eliminar despu辿s de"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "d鱈as"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 msgid "0 days: remove immediately"
 msgstr "0 d鱈as: eliminar inmediatamente"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Descargar todos los mensajes del servidor"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "Tama単o l鱈mite para recibir"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "Kb"
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensajes al recibir"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "Buz坦n por defecto"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 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:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "M辿todo de autentificaci坦n"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "Autom叩tica"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
 msgstr "S坦lo comprobar Entrada al recibir"
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "Filtrar mensajes al recibir"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "Noticias"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 msgid "Maximum number of articles to download"
 msgstr "N炭mero m叩ximo de art鱈culos a descargar"
 
-#: src/prefs_account_dialog.c:1024
+#: src/prefs_account_dialog.c:1030
 msgid "No limit if 0 is specified."
 msgstr "Sin l鱈mite si se especifica 0."
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 msgid "`Get all' checks for new messages on this account"
 msgstr "束Recibir todo損 comprueba si hay mensajes nuevos en esta cuenta"
 
-#: src/prefs_account_dialog.c:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Cabecera"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "A単adir campo Fecha"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "Generar ID-Mensaje"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "A単adir cabecera de usuario"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " Editar... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "Autentificaci坦n"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentificaci坦n SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4245,197 +4250,197 @@ msgstr ""
 "Si deja estos campos vac鱈os, se utilizar叩 el mismo ID de usuario y "
 "contrase単a usados para la recepci坦n."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentificaci坦n con POP3 antes de enviar"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 msgid "Command output"
 msgstr "Salida de la orden"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Establecer las siguientes direcciones autom叩ticamente"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "Firmar el mensaje por defecto"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "Encriptar el mensaje por defecto"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr "Encriptar al responder a un mensaje cifrado"
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "Usar formato ASCII blindado para encriptaci坦n"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "Usar firma de texto claro"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "Firmar clave"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "Usar la clave GnuPG por defecto"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "Seleccionar clave por direcci坦n de correo"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "Especificar clave manualmente"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "Usuario o ID de clave:"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "No usar SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "Usar SSL para la conexi坦n POP3"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usar el mandato STARTTLS para abrir la sesi坦n SSL"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usar SSL para la conexi坦n IMAP4"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para la conexi坦n NNTP"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "Usar SSL para la conexi坦n SMTP"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr "Utilizar SSL no bloqueante"
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Desact鱈velo si tiene problemas con la conexi坦n SSL."
 
-#: src/prefs_account_dialog.c:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "Puerto SMTP"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "Puerto POP3"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "Puerto IMAP4"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "Puerto NNTP"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "Nombre del dominio"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "Directorio del servidor IMAP4"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 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:1760
+#: src/prefs_account_dialog.c:1767
 msgid "Clear all message caches on exit"
 msgstr "Limpiar todas las caches de mensajes al salir"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "Poner mensajes enviados en"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "Poner borradores de mensajes en"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 msgid "Put queued messages in"
 msgstr "Poner mensajes para la cola en"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "Poner mensajes borrados en"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "No se especific坦 el nombre de cuenta."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "No se especific坦 la direcci坦n de correo."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "No se especific坦 el servidor SMTP."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "No se especific坦 el usuario."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "No se especific坦 el servidor POP3."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "No se especific坦 el servidor IMAP4."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "No se especific坦 el servidor NNTP."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr "La carpeta especificada no es una carpeta de cola."
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6659,31 +6664,31 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 msgid "Sa_ve this image as..."
 msgstr "_Guardar imagen como..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Componer mensaje _nuevo"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 msgid "Add to address _book..."
 msgstr "A単adir _remitente a la agenda..."
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 msgid "Copy this add_ress"
 msgstr "Copiar esta di_recci坦n"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 msgid "_Open with Web browser"
 msgstr "_Abrir con el navegador web"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr "Copiar el en_lace"
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6695,7 +6700,7 @@ msgstr ""
 "URL aparente (%s).\n"
 "多Quiere abrirla de todas maneras?"
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr "Aviso de URL falsa"
 
diff --git a/po/et.po b/po/et.po
index 6fe4a87d..2087909b 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2002-10-02 09:08+0300\n"
 "Last-Translator: Peeter Vois <Peeter.Vois@mail.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -18,201 +18,201 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Loen k探igi kontode seaded...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 端hendus %s:%d-ga katkes. Taas端hendan...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP serveri kataloog"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "loon IMAP4 端hendust %s:%d-ga ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "Ei suuda avada TLS sessiooni.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Kustutan kirja %d"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Saadan kirja (%d / %d baiti)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Liigutan kirja %s%c%d kausta %s ...\n"
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopeerin kirja %s%c%d kausta %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "V探tan kirju %s-st ja panen %s-i...\n"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ei suutnud seada kustutatu lippu: %d\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "ei suuda v辰ljastada\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "V探tan kirju %s-st ja panen %s-i...\n"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ei suutnud seada kustutatu lippu: 1:%d\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ei suuuda valida kausta: %s\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "*M辰rgi faili ei leidunud.\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "Nimistu saamisel tekkis viga.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Ei suuda luua '%s'\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Ei suuda luua '%s' Sisendkasti all\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ei suuda luua kirjakasti: Nimistu eba探nnestus\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "ei suuda luua kirjakasti\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ei suuda kirjakasti %s-lt 端mber nimetada %s-le\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "ei suuda kustutada kirjakasti\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "ei suuda v探tta 端mbrikut\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Saadan kirja (%d / %d baiti)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "端mbriku v探tmisel tekis viga.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ei suutnud avada 端mbrikut: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ei suuda 端hendada IMAP4 serveriga: %s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ei suuda 端hendada IMAP4 serveriga: %s:%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "ei suutnud leida nime asukohta\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ei suuuda valida kausta: %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "imapi k辰su t辰itmisel tekkis viga: EXPUNGE\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autoriseerimise meetod"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 sissekirjutus eba探nnestus.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ei suuda %s-d lisada %s-i\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(saadan faili...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ei suuda lisada kirja %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ei suuda %d-d kopeerida %s-i\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imapi k辰su t辰itmisel tekkis viga: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imapi k辰su t辰itmisel tekkis viga: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "imapi k辰su t辰itmisel tekkis viga: EXPUNGE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ei suuda konversteerida UTF-7-t %s-ks\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ei suuda konverteerida %s-i UTF-7-ks\n"
@@ -299,25 +299,25 @@ msgstr "kirjakasti ei saa l探igata nulliks.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Ekspordime teated %s-ist %s-i ...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ei saa kirja kopeerida %s-st %s-i\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "Ei suutnud avada m辰rgi faili.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "l辰htekaust on identne sihtkaustale.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopeerin kirja %s%c%d kausta %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -326,7 +326,7 @@ msgstr ""
 "Fail %s on juba olemas.\n"
 "Ei saa kausta luua."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -338,77 +338,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "loon NNTP 端hendust %s:%d-ga ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP 端hendus %s:%d-ga on katkestatud. Taas端hendan...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "artikkel %d on juba hoidlas.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "v探tan artikli %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "ei saanud artiklit %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "ei saanud saata artiklit.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "ei saanud artiklit %d kohale\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "ei saa valida gruppi %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ebasobiv artiklite vahemik: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "uusi artikelid pole.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "*v探tan xover-i %d - %d %s-is\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "*ei saa xover'it\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "*xover'i v探tmisel tekkis viga\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "*vigane xover rida: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "*ei saa xhdr-i\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "xhdr-i v探tmise k辰igus tekkis viga.\n"
 
@@ -489,7 +489,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "autoriseerimisel tekkis viga\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "H辰辰lestuse salvestamine eba探nnestus\n"
@@ -521,12 +521,12 @@ msgstr "procmime_get_text_content(): Koodi muundamine eba探nnestus.\n"
 msgid "can't open mark file\n"
 msgstr "Ei suuda avada m辰rgifaili\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ei suuda v探tta kirja %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Tr端kkimise k辰surida on vale: %s\n"
@@ -695,7 +695,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nimi"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -1161,7 +1161,7 @@ msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Kaust"
@@ -1194,7 +1194,7 @@ msgstr "M辰rkus"
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "Viga"
 
@@ -1751,7 +1751,7 @@ msgstr "MIME t端端p"
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "Saada"
@@ -1793,7 +1793,7 @@ msgid "Attach file"
 msgstr "Manusta fail"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "Allkiri"
@@ -2008,7 +2008,7 @@ msgid " Check File "
 msgstr " Kontrolli faili "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "Fail"
 
@@ -2086,7 +2086,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2151,7 +2151,7 @@ msgstr "Ajalimiit (sek)"
 msgid "Maximum Entries"
 msgstr "Sissekannete piirarv"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "Baas"
 
@@ -2208,7 +2208,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Vali... "
 
@@ -2365,12 +2365,12 @@ msgstr "Sean kausta info...\n"
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
@@ -2646,7 +2646,7 @@ msgstr "Impordi LDIF fail aadressiraamatusse"
 msgid "Prev"
 msgstr "Eelm"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "J辰rgmine"
 
@@ -2667,202 +2667,202 @@ msgstr "Soome"
 msgid "Sylpheed: %d new messages"
 msgstr "L探petatud (%d uut kirja)"
 
-#: src/inc.c:388
+#: src/inc.c:433
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autoriseerimine"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "V探tan uusi kirju"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "*Juures"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "Katkestatud"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "Tirin"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Valmis (%d kirja (%s)-st v探etud)"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "Valmis (uusi kirju pole)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "��hendus eba探nnestus"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "Autoriseerimine eba探nnestus"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "Lukustatud"
 
-#: src/inc.c:637
+#: src/inc.c:682
 #, fuzzy
 msgid "Timeout"
 msgstr "Ajalimiit (sek)"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "L探petatud (%d uut kirja)"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "L探petatud (uusi kirju pole)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "Tekksiid m探ned vead kirjade v探tmisel."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "v探tan uued kirjad kontolt %s...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autoriseerimine"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Uute kirjade v探tmine"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "��hendan POP3 serveriga: %s ..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ei suuda 端henduda POP3 serveriga %s:%d\n"
 
-#: src/inc.c:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Autoriseerin..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "V探tan kirju %s-st ja panen %s-i...\n"
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "V探tan uute kirjade arvu (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "V探tan uute kirjade arvu (STAT)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "V探tan uute kirjade arvu (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "V探tan kirjade suuruse (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "Kustutan kirja %d"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "V辰ljun"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "V探tan kirja (%d /%d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Valmis (%d kirja (%s)-st v探etud)"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 #, fuzzy
 msgid "Connection failed."
 msgstr "��hendus eba探nnestus"
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "Ketas t辰is."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 #, fuzzy
 msgid "Can't write file."
 msgstr "Ei saa kirjutada faili.\n"
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 #, fuzzy
 msgid "Socket error."
 msgstr "Soketi viga\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "Sissekanne peatatud\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "V探tame uued teated %s-ist %s-i.\n"
@@ -3774,7 +3774,7 @@ msgstr "V探ta k探igilt kontodelt uued kirjad"
 msgid "Send queued message(s)"
 msgstr "Saada kirjad j辰rjekorrast"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Kirjuta"
@@ -3816,62 +3816,62 @@ msgstr "Kustuta kiri"
 msgid "Set as junk mail"
 msgstr " M辰辰ra vaikimisi kontoks "
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "K辰ivita"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "K辰ivita m辰rgitud protsess"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "J辰rgmine kiri mida pole loetud"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "Seaded"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "��ldised omaduse"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "Konto seaded"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "V辰lju"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "L探petame programmi t旦旦."
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 #, fuzzy
 msgid "Command line options"
 msgstr "K辰surida ei ole sisestatud."
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Kauta: %s [SEADED]...\n"
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3887,7 +3887,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4097,225 +4097,230 @@ msgstr ""
 "Vale parool! Proovi uuesti...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "Avan konto parameetrite akent...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "Uue konto omadused"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Konto omadused"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "Loon konto omaduste akent...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "Saabuvad kirjad"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "Privaatsus"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "Spetsiaalne"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "Selle konto nimi"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr " M辰辰ra vaikimisi kontoks "
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "Isiku informatsioon"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "T辰isnimi"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "E-Posti aadress"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "Ofganisatsioon"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "Serveri informatsioon"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "Uudised (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "Lokaalarvutist"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "See servar n探uab autoriseerimist"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "Uudiste server"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "Sissetulevate kirjade server"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "Saatmise server (SMTP)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "Kasutajanimi"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "Parool"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "See servar n探uab autoriseerimist"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "Kustuta kirjad p辰rast kohalej探udmist serverist"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "Eemalda p辰rast"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "p辰eva"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 p辰eva: eemalda kohe)"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "V探ta serverist k探ik kirjad"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "T探mbamise suuruse limiit"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "Filtreeri saabuvaid kirju"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "Vaikimisi sisendkast"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Filtreerimata kirjad salvestatakse sellesse kausta)"
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "Autoriseerimise meetod"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "Filtreeri saabuvaid kirju"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "Uudised"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 #, 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:1024
+#: src/prefs_account_dialog.c:1030
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Saaja pole m辰辰ratud."
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 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:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "P辰is"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "Lisa kuup辰ev p辰isesse"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "Loo Kirja-ID"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "Lisa kasutaja defineeritud p辰is"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " Redigeeri... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "Autoriseerimine"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Autoriseerimine (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4324,200 +4329,200 @@ msgstr ""
 "Kui te j辰tate need sissekanded t端hjaks, siis \n"
 "kasutatakse vastuv探tva kasutaja ID-d ja parooli."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "Autoriseeri POP3 enne saatmist"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 #, fuzzy
 msgid "Command output"
 msgstr "K辰sklus"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "S辰ti j辰rgmised aadressid automaatselt"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "Vastus saata"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "Vaikimisi tuleb kiri allkirjastada"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "Vaikimisi tuleb kiri kr端pteerida"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "Kasuta ASCII-ga varustatud kr端pteerimise formaati"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "Kasuta seleget teksti allkirja"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "Allkirja v探ti"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "Kasuta algset GnuPG v探tit"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "Vali v探ti elektronposti aadressi juurest"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "M辰辰ra v探ti k辰sitsi"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "Kasutaja v探i v探tme ID:"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "��ra kasuta SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "Kasuta SSL-i POP3-e 端henduse jaoks"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Kasuta STARTTLS k辰sklust et alustada SSL sessiooni"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "Kasuta SSL-i IMAP4-ja 端henduse jaoks"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "Kasuta SSL-i NNTP 端henduse loomisel"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "Saada (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "Kasuta SSL-i SMTP 端henduse jaoks"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "M辰辰ra SMTP port"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "M辰辰ra POP3 port"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "M辰辰ra IMAP4 port"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "M辰辰ra NNTP port"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "M辰辰ra domeeni nimi"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "IMAP serveri kataloog"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "V探ta serverist k探ik kirjad"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "Pane saadetud kirjad"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "Pane mustandi kirjad"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Pane kustutatud kirjad"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "Pane kustutatud kirjad"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "Konto nime ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "Postiaadressi ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "SMTP serverit ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "Kasutajanime ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "POP3 serverit ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 serverit ei ole sisestatud"
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "NNTP serverit ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6827,36 +6832,36 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/Salveta kui..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Kirjuta uus kiri"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Lisa saatje aadressi raamatusse"
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "��ldine aadress"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Weebi sirvur"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6865,7 +6870,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 3173fb86..e3728a9b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2007-01-14 02:22+0100\n"
 "Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
 "Language-Team: French\n"
@@ -28,194 +28,194 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Lecture de la configuration des comptes...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connexion IMAP4 vers %s a 辿t辿 interrompue. Reconnexion...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Le serveur IMAP4 d辿sactive LOGIN.\n"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "cr辿ation de la connexion IMAP4 vers %s:%d ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "Impossible d'initier la session TLS.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, c-format
 msgid "Getting message %d"
 msgstr "R辿ception du message %d"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Ajout des messages �� %s (%d / %d)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "D辿placement des messages de %s vers %s ..."
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copie des messages de %s vers %s ..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "Effacement des messages %s"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "impossible de marquer pour la suppression : %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "impossible de purger\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Effacement de tous les messages dans %s"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "impossible de marquer pour la suppression : 1:*\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "impossible de fermer le dossier\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "le dossier racine %s n'existe pas\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "Une erreur est survenue lors de la r辿ception de LIST.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Impossible de cr辿er 束 %s 損\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Impossible de cr辿er 束 %s 損 sous R辿ception \n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Impossible de cr辿er la bo樽te aux lettres : LIST 辿chou辿.\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "impossible de cr辿er la bo樽te aux lettres\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "impossible de renomer la bo樽te aux lettres %s en %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "impossible de supprimer la bo樽te aux lettres\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "Impossible de faire une enveloppe\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "R辿ception des en-t棚tes de message (%d / %d)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "erreur lors de la lecture de l'enveloppe.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "impossible d'analyser l'enveloppe : %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur IMAP4 : %s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Impossible d'辿tablir une session IMAP4 avec : %s:%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "Impossible d'obtenir l'espace nom\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Impossible de s辿lectionner le dossier : %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 msgid "error on imap command: STATUS\n"
 msgstr "erreur avec la commande IMAP : STATUS\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 msgid "IMAP4 authentication failed.\n"
 msgstr "L'authentification IMAP4 a 辿chou辿.\n"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "��chec au login IMAP4.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "Impossible de d'ajouter %s �� %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(envoi du fichier...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "impossible d'ajouter le message �� %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "impossible de copier %s vers %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erreur avec la commande IMAP : STORE %s %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erreur lors de la commande IMAP : EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 msgid "error while imap command: CLOSE\n"
 msgstr "erreur avec la commande IMAP : CLOSE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne peut convertir de UTF-7 vers %s\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne peut convertir de %s vers UTF-7\n"
@@ -302,25 +302,25 @@ msgstr "Impossible de vider la bo樽te aux lettres.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportation des messages de %s vers %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "Impossible de copier le message de %s �� %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "Impossible d'ouvrir le fichier des marques.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "dossier source identique �� la destination.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copie du message %s%c%d vers %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -329,7 +329,7 @@ msgstr ""
 "Le fichier 束 %s 損 existe d辿j��.\n"
 "Impossible de cr辿er le dossier."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -350,77 +350,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "Cr辿ation de la connexion NNTP vers %s:%d ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "La connexion NNTP vers %s:%d a 辿t辿 coup辿e. Reconnexion...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "L'article %d a d辿j�� 辿t辿 mis en cache.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "R辿cup辿ration de l'article %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "Impossible de lire l'article %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "Impossible de poster l'article.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "Impossible de r辿cup辿rer l'article %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "impossible de s辿lectionner le groupe : %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "Intervalle d'articles invalide : %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "Pas de nouvel article.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "Ex辿cution de xover %d - %d sur %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "Impossible de faire un xover\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "Une erreur a eu lieu pendant la lecture du xover.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "Ligne xover invalide : %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "Impossible d'obtenir xhdr\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "Erreur lors de la r辿ception de xhdr.\n"
 
@@ -499,7 +499,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "une erreur est survenue pendant la session POP3\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "��chec d'辿criture de la configuration dans le fichier\n"
@@ -529,12 +529,12 @@ msgstr "procmime_get_text_content() : la conversion de code a 辿chou辿.\n"
 msgid "can't open mark file\n"
 msgstr "Impossible d'ouvrir le fichier des marques\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "impossible de r辿cup辿rer le message %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La ligne de commande d'impression est invalide : 束 %s 損\n"
@@ -705,7 +705,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nom"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "Protocole"
 
@@ -1171,7 +1171,7 @@ msgid "Group"
 msgstr "Groupe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Dossier"
@@ -1204,7 +1204,7 @@ msgstr "Information"
 msgid "Warning"
 msgstr "Avertissement"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "Erreur"
 
@@ -1729,7 +1729,7 @@ msgstr "Type MIME"
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "Envoyer"
@@ -1771,7 +1771,7 @@ msgid "Attach file"
 msgstr "Joindre un fichier"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "Signature"
@@ -1980,7 +1980,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:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "Fichier"
 
@@ -2060,7 +2060,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2125,7 +2125,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:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "G辿n辿ral"
 
@@ -2183,7 +2183,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Choisir... "
 
@@ -2333,12 +2333,12 @@ msgstr "Enregistrement des donn辿es des dossiers...\n"
 msgid "Setting folder info..."
 msgstr "Initialisation des donn辿es des dossiers..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
@@ -2614,7 +2614,7 @@ msgstr "Importation d'un fichier LDIF dans un carnet d'adresses"
 msgid "Prev"
 msgstr "Pr辿c辿dent"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "Suivant"
 
@@ -2635,142 +2635,142 @@ msgstr "Termin辿"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed : %d nouveau(x) message(s)"
 
-#: src/inc.c:388
+#: src/inc.c:433
 msgid "Authenticating with POP3"
 msgstr "Authentification POP3"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "R辿cup辿ration des nouveaux messages"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "Attente"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "Annul辿"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "R辿cup辿ration"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Termin辿 - %d message(s) %s re巽u(s)"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "Termin辿 - pas de nouveau(x) message(s)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "La connexion a 辿chou辿"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "L'authentification a 辿chou辿"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "Verrouill辿"
 
-#: src/inc.c:637
+#: src/inc.c:682
 msgid "Timeout"
 msgstr "D辿lai d'attente"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Termin辿 - %d nouveau(x) message(s)"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "Termin辿 - pas de nouveau(x) message(s)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "Erreur lors de la r辿cup辿ration des messages."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "R辿cup辿ration des nouveaux messages du compte %s ...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s : Authentification POP3"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : R辿cup辿ration des nouveaux messages"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Connexion au serveur POP3 : %s..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, 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:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Authentification..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "R辿ception des messages de %s..."
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "R辿cup辿ration du nombre de nouveaux messages (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "R辿cup辿ration du nombre de nouveaux messages (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "R辿cup辿ration du nombre de nouveaux messages (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "R辿cup辿ration de la taille des messages"
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "Suppression du message %d"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "Fermeture"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "R辿cup辿ration du message (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "R辿ception - %d message(s) %s re巽u(s)"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 msgid "Connection failed."
 msgstr "La connexion a 辿chou辿."
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "Une erreur est survenue pendant le traitement du message."
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2779,28 +2779,28 @@ msgstr ""
 "Une erreur est survenue pendant le traitement du message :\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "Plus de place disponible sur le disque."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "Impossible d'辿crire dans le fichier."
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "Erreur de protocole."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr "La connexion a 辿t辿 ferm辿e par le serveur."
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "Bo樽te verrouill辿e."
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2809,11 +2809,11 @@ msgstr ""
 "Bo樽te verrouill辿e :\n"
 "%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 msgid "Authentication failed."
 msgstr "L'authentification �� 辿chou辿."
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2822,15 +2822,15 @@ msgstr ""
 "L'authentification a 辿chou辿 :\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr "D辿passement du d辿lai de r辿ponse (timeout) de la session."
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "Rel竪ve du courrier annul辿e\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "R辿cup辿ration des nouveaux messages de %s dans %s...\n"
@@ -3716,7 +3716,7 @@ msgstr "Relever le courrier de tous les comptes"
 msgid "Send queued message(s)"
 msgstr "Envoyer les messages en attente"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Composer"
@@ -3757,60 +3757,60 @@ msgstr "Supprimer le message"
 msgid "Set as junk mail"
 msgstr "Marquer comme ind辿sirable"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "Ex辿cuter"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "Ex辿cuter les commandes marqu辿es"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "Message non lu suivant"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "Pr辿f辿rences"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "Pr辿f辿rences g辿n辿rales"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Compte"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "Configuration du compte courant"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr "Vous 棚tes d辿connect辿. Cliquer sur l'ic担ne pour vous connecter."
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr "Vous 棚tes connect辿. Cliquer sur l'ic担ne pour vous d辿connecter."
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "Quitter Sylpheed ?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 msgid "Command line options"
 msgstr "Options de la ligne de commande"
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Utilisation : sylpheed [OPTION]..."
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3838,7 +3838,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4060,219 +4060,224 @@ msgstr ""
 "Phrase secr竪te incorrecte. Autre tentative...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "Ouverture de la fen棚tre de configuration du compte...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "Compte%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "Configuration du nouveau compte"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Configuration du compte"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "Cr辿ation de la fen棚tre de configuration du compte...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "R辿ception"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "Confidentialit辿"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "Avanc辿e"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "Nom du compte"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "D辿finir comme compte par d辿faut"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "Informations personnelles"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "Nom complet"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "Adresse 辿lectronique"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "Configuration des serveurs"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "Aucun (local)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "Ce serveur n辿cessite une authentification"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "Serveur de groupes de discussion"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "Serveur de r辿ception"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "Serveur SMTP (envoi)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "Nom de l'utilisateur"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "Mot de passe"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 msgid "Use secure authentication (APOP)"
 msgstr "Utiliser l'authentification s辿curis辿e (APOP)"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "Suppression des messages du serveur apr竪s r辿ception"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "Supprimer apr竪s"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "jours"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 msgid "0 days: remove immediately"
 msgstr "0 jours : effacer imm辿diatement"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 msgid "Download all messages (including already received) on server"
 msgstr ""
 "T辿l辿chargement de tous les messages pr辿sents sur le serveur (y compris ceux "
 "d辿j�� re巽us)"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "Taille maximale pour la r辿ception"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "Ko"
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "Filtrage des messages �� la r辿ception"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "Bo樽te de r辿ception par d辿faut"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 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:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "M辿thode d'authentification"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
 msgstr "V辿rifier seulement INBOX lors de la r辿ception"
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "Filtrage des messages �� la r辿ception"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "Articles de groupes de discussion"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 msgid "Maximum number of articles to download"
 msgstr "Nombre maximum d'articles �� r辿cup辿rer"
 
-#: src/prefs_account_dialog.c:1024
+#: src/prefs_account_dialog.c:1030
 msgid "No limit if 0 is specified."
 msgstr "Aucune limite pour la valeur 0."
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 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:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "En-t棚te"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "Ajouter un champ 束 Date 損 �� l'en-t棚te"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "G辿n辿ration d'un Message-ID"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "Ajouter des en-t棚tes suppl辿mentaires"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " Modifier... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "Authentification"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Authentification SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4280,197 +4285,197 @@ msgstr ""
 "Laissez ces champs vides pour utiliser le nom d'utilisateur et le mot de "
 "passe sp辿cifi辿s pour la r辿ception."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "S'authentifier sur le POP3 avant l'envoi"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr "Texte"
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 msgid "Command output"
 msgstr "Sortie"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "D辿finition automatique des adresses suivantes"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "Copie"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Copie discr竪te"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "R辿pondre ��"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "Signer le message par d辿faut"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "Chiffrer le message par d辿faut"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr "Chiffrer les r辿ponses �� un message chiffr辿"
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "Utiliser le format ASCII-arm辿 pour le chiffrement"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "Utiliser une signature non chiffr辿e"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "Cl辿 de signature"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "Utiliser la cl辿 par d辿faut de GnuPG"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "S辿lectionner la cl辿 en fonction de l'adresse 辿lectronique"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "Indiquer manuellement la cl辿"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "Utilisateur ou identificateur (ID) de cl辿 :"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "Ne pas utiliser SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "Utiliser SSL pour les connexions POP3"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Utiliser la commande STARTTLS pour commencer une session SSL"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "Utiliser SSL pour les connexions IMAP4"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "Utiliser SSL pour les connexions NNTP"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "Envoi (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "Utiliser SSL pour les connexions SMTP"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr "Utiliser SSL non-bloquant"
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 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:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "Indiquer le port SMTP"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "Indiquer le port POP3"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "Indiquer le port IMAP4"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "Indiquer le port NNTP"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "Indiquer le nom de domaine"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "R辿pertoire IMAP4"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 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:1760
+#: src/prefs_account_dialog.c:1767
 msgid "Clear all message caches on exit"
 msgstr "Nettoyer les caches de message en quittant"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "Placer les messages envoy辿s dans"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "Placer les brouillons dans"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 msgid "Put queued messages in"
 msgstr "Placer les messages en attente d'envoi dans"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "Placer les messages supprim辿s dans"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "Nom du compte non indiqu辿."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "Adresse 辿lectronique non saisie."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "Serveur SMTP non indiqu辿."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "Nom d'utilisateur manquant."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "Serveur POP3 non indiqu辿."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "Serveur IMAP4 non indiqu辿."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "Serveur NNTP non indiqu辿."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr "Le dossier indiqu辿 n'est pas une file d'attente."
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6718,31 +6723,31 @@ msgstr ""
 "Le corps du texte ne peut pas 棚tre affich辿 car la cr辿ation du fichier "
 "temporaire a 辿chou辿.\n"
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 msgid "Sa_ve this image as..."
 msgstr "Enregistrer cette _image sous..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Composer un _nouveau message"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 msgid "Add to address _book..."
 msgstr "_Ajouter au carnet d'adresses..."
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 msgid "Copy this add_ress"
 msgstr "Copier cette ad_resse"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 msgid "_Open with Web browser"
 msgstr "_Ouvrir dans le navigateur Web"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr "Copier ce _lien"
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6754,7 +6759,7 @@ msgstr ""
 "\n"
 "Voulez-vous n辿anmoins l'ouvrir ?"
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr "Localisateur (URL) suspect"
 
diff --git a/po/gl.po b/po/gl.po
index c59d897c..dd1aa53a 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -18,200 +18,200 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Lendo configuraci坦n de cada conta...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Perdeuse a conexi坦n IMAP4 con %s:%d . Reconectando...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Directorio do servidor IMAP4"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "creando conexi坦n IMAP4 con %s:%d ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "Non podo iniciar a sesi坦n TLS.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Borrando mensaxe %d"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Enviando mensaxe (%d / %d bytes)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Movendo mensaxe %s%c%d a %s ...\n"
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiando mensaxe %s%c%d a %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "non podo establecer os indicadores borrados: %d\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "non podo baleirar\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "non podo establecer os indicadores borrados: 1:%d\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "non se pode seleccionar a carpeta: %s\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Ficheiro de marcas non atopado.\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "ocurriu un erro obtendo LIST.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Non podo crear '%s'\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Non podo crear '%s' bajo Entrada\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "non podo crear a: LIST fall坦\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "non podo crear a caixa de correo\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "non podo renomear a caixa de correo: %s a %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "non podo borrar a caixa de correo\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "non se pode obter a estructura da mensaxe\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Enviando mensaxe (%d / %d bytes)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "Erro obtendo a estructura da mensaxe.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "Non se pode interpretar a estructura da mensaxe: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Non se pode conectar con o servidor IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Non podo establecer unha sesi坦n IMAP4 con: %s:%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "no se pode obter o espacio de nomes\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "non se pode seleccionar a carpeta: %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Fallo de autenticaci坦n"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificaci坦n IMAP4 fallida.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "non podo engadir %s a %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(enviando ficheiro...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "non se pode engadir o mensaxe %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "non podo copiar %d a %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erro no comando imap: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv non pode convertir UTF-7 a %s\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non pode convertir %s a UTF-7\n"
@@ -298,25 +298,25 @@ msgstr "non se pode truncar a cero a caixa de correo.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportando mensaxes de %s a %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "non se pode copiar mensaxe %s a %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "Non se pode abrir o ficheiro de marcas.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "carpetas de orixen e desti単o id辿nticas.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copiando mensaxe %s%c%d a %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -325,7 +325,7 @@ msgstr ""
 "o Ficheiro `%s' xa existe.\n"
 "Non podo crear a carpeta."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -337,77 +337,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "creando conexi坦n NNTP con %s:%d ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "perdeuse a conexi坦n NNTP con %s:%d . Reconectando...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "o artigo %d xa esta en cach辿.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "obtendo artigo %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "no podo leer o art鱈culo %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "no se pode enviar o art鱈culo.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "no podo obter o art鱈culo %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "non podo seleccionar grupo %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "rango de art鱈culos no v叩lido: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "no hai art鱈culos novos.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obteniendo xover %d - %d en %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "no se pode obtener xover\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "ocurriu un erro obtendo xover.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "linea xover non v叩lida: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "non se pode obter xhdr\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "ocurriu un erro obtendo xhdr.\n"
 
@@ -486,7 +486,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "ocurriu alg炭n erro na sesi坦n POP3\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "fallo escribiendo a configuraci坦n a ficheiro\n"
@@ -518,12 +518,12 @@ msgstr "procmime_get_text_content(): Conversi坦n de c坦digos fallida.\n"
 msgid "can't open mark file\n"
 msgstr "no se pode abrir o ficheiro de marcas\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "non se pode obter o mensaxe %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "o comando de impresi坦n non 辿 v叩lido: `%s'\n"
@@ -693,7 +693,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nome"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -1160,7 +1160,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Carpeta"
@@ -1193,7 +1193,7 @@ msgstr "Notificaci坦n"
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "Erro"
 
@@ -1750,7 +1750,7 @@ msgstr "Tipo MIME"
 msgid "Size"
 msgstr "Tama単o"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "Enviar"
@@ -1792,7 +1792,7 @@ msgid "Attach file"
 msgstr "Adxuntar ficheiro"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "Sinatura"
@@ -2006,7 +2006,7 @@ msgid " Check File "
 msgstr " Comprobar ficheiro "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "Ficheiro"
 
@@ -2084,7 +2084,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2149,7 +2149,7 @@ msgstr "Tiempo l鱈mite (seg.)"
 msgid "Maximum Entries"
 msgstr "N尊 entradas m叩ximas"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "Basico"
 
@@ -2207,7 +2207,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "Seleccionar..."
 
@@ -2363,12 +2363,12 @@ msgstr "Establecendo informaci坦n de carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Establecendo informaci坦n de carpeta..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -2642,7 +2642,7 @@ msgstr "Importar ficheiro LDIF na axenda"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "Seguinte"
 
@@ -2663,145 +2663,145 @@ msgstr "Finalizar"
 msgid "Sylpheed: %d new messages"
 msgstr "Finalizado (%d mensaxe(s) novo(s))"
 
-#: src/inc.c:388
+#: src/inc.c:433
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autenticando"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "Obtendo novos mensaxes"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Feito (%d mensaxe(s) (%s) recibido(s))"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "feito (non hai mensaxes novos)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "Conexi坦n fallida"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "Autorizaci坦n fallida"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:637
+#: src/inc.c:682
 #, fuzzy
 msgid "Timeout"
 msgstr "Tiempo l鱈mite (seg.)"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finalizado (%d mensaxe(s) novo(s))"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "Finalizado (non hai mensaxes novos)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "Ocurriu alg炭n erro obtendo o correo."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obtendo novas mensaxes da conta %s...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autenticando"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando novas mensaxes"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando 坦 servidor POP3: %s ..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, 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:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtendo o n炭mero de novas mensaxes (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtendo o n炭mero de novas mensaxes (STAT)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtendo o n炭mero de novas mensaxes (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o tama単o de novas mensaxes (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "Borrando mensaxe %d"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "Sa鱈ndo"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaxe (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Feito (%d mensaxe(s) (%s) recibido(s))"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 #, fuzzy
 msgid "Connection failed."
 msgstr "Conexi坦n fallida"
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "Ocurriu un erro mentras se procesaba o correo."
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2810,28 +2810,28 @@ msgstr ""
 "Ocurriu un erro mentras se procesaba o correo:\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "Non hai espacio libre no disco."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "Non se pode escribir o ficheiro."
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "Error de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "a caixa de correo esta bloqueada."
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2840,12 +2840,12 @@ msgstr ""
 "a caixa de correo esta bloqueada:\n"
 "%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Fallo de autenticaci坦n"
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2854,15 +2854,15 @@ msgstr ""
 "Fallo de autenticaci坦n:\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "Incorporaci坦n cancelada\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obtendo novos mensaxes dende %s en %s...\n"
@@ -3775,7 +3775,7 @@ msgstr "Incorporar correo novo de todas as contas"
 msgid "Send queued message(s)"
 msgstr "Enviar mensaxe(s) na cola"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Compo単er"
@@ -3817,62 +3817,62 @@ msgstr "Borrar o mensaxe"
 msgid "Set as junk mail"
 msgstr "conta por defecto"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "Executar"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "Executar o proceso marcado"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "Seguinte non le鱈do"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "Preferencias"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "Preferencias comuns"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "conta"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "Preferencias da conta"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "多Sair do programa?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 #, fuzzy
 msgid "Command line options"
 msgstr "Non se estableceu o comando."
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: %s [OPCI��N]...\n"
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3888,7 +3888,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4098,225 +4098,230 @@ msgstr ""
 "臓Contrasinal err坦neo! Intenteo de novo...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "Abrindo Fiestra de preferencias de conta...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "conta%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "Preferencias para unha nova conta"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Preferencias da conta"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "Creando Fiestra de preferencias de conta...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "Avanzadas"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "Nome desta conta"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "conta por defecto"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "Informaci坦n persoal"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "Nome completo"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "Enderezo de correo"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "Organizaci坦n"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "Informaci坦n do servidor"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "Novas (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "Ningunha (local)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "Este servidor require autenticaci坦n"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "Servidor de novas"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "Servidor de recepci坦n"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "Usuario"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "Contrasinal"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Este servidor require autenticaci坦n"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "Eliminar mensaxes do servidor 坦 recibir"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "Eliminar despois de"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "d鱈as"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 d鱈as: eliminar inmediatamente)"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Descargar todas as mensaxes do servidor"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "Tama単o l鱈mite para recibir"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensaxes 坦 recibir"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "Caixa de correo por defecto"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(As mensaxes sen filtrar gardar叩nse nesta carpeta)"
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "M辿todo de autenticaci坦n"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "Autom叩tica"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "Filtrar mensaxes 坦 recibir"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "Novas"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 #, 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:1024
+#: src/prefs_account_dialog.c:1030
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 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:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Cabeceira"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "Engadir campo Data"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "Xenerar ID-Mensaxe"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "Engadir cabeceira de usuario"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " Editar... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "Autenticaci坦n"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticaci坦n SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4325,200 +4330,200 @@ msgstr ""
 "Si deixa estes campos valeiros, utilizar叩se o mesmo\n"
 "ID de usuario e contrasinal usados para a recepci坦n."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "Autenticaci坦n con POP3 antes de enviar"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 #, fuzzy
 msgid "Command output"
 msgstr "Saida do comando"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Establecer os seguintes enderezos autom叩ticamente"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "Respostar a"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "Asinar a mensaxe por defecto"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "Encriptar a mensaxe por defecto"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "Usar formato ASCII blindado para encriptaci坦n"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "Usar sinatura de texto claro"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "Asinar clave"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "Usar clave GnuPG por defecto"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "Seleccionar clave por direcci坦n de correo"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "Especificar clave manualmente"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "Usuario ou ID clave:"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "Non usar SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "Usar SSL para a conexi坦n POP3"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usar o comando STARTTLS para abrir a sesi坦n SSL"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usar SSL para a conexi坦n IMAP4"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para a conexi坦n NNTP"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "Usar SSL para a conexi坦n SMTP"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "Porto SMTP"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "Porto POP3"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "Porto IMAP4"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "Porto NNTP"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "Nome do dominio"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "Directorio do servidor IMAP4"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Descargar todas as mensaxes do servidor"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "Po単er mensaxes enviadas en"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "Po単er borradores de mensaxes en"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Po単er mensaxes borradas en"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "Po単er mensaxes borradas en"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "Non se especificou o nome de conta."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "Non se especificou o enderezo de correo."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "Non se especificou o servidor SMTP."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "Non se especificou o usuario."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "Non se especificou o servidor POP3."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "Non se especificou o servidor IMAP4."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "Non se especificou o servidor NNTP."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6824,36 +6829,36 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Gardar como..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Compo単er mensaxe novo"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Engadir _remitente 叩 axenda"
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Enderezo com炭n"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Navegador web"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6862,7 +6867,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/hr.po b/po/hr.po
index 9ef54562..9bee11f3 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2001-09-17 13:22+0100\n"
 "Last-Translator: Ante Karamati�� <ante@cdnet.com.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -18,202 +18,202 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "��itam konfiguracije za svaki ra��un...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 veza prema %s:%d je pukla. Povezujem se ponovo...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Direktorij IMAP poslu転itelja"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "ostvarujem IMAP4 vezu prema %s:%d ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr ""
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Bri邸em poruke"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "��aljem poruku (%d / %d bytea)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Premje邸tam poruke %s%c%d u %s ...\n"
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ne mogu postaviti obrisane oznake: %d\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "ne mogu obrisati\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ne mogu postaviti obrisane oznake: 1:%d\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Ozna��ena datoteka ne postoji.\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "do邸lo je do gre邸ke prilikom dobivanja LISTe.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, fuzzy, c-format
 msgid "Can't create '%s'\n"
 msgstr "ne mogu kreirati %s\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, fuzzy, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "ne mogu kreirati %s\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ne mogu kreirati sandu��i��: LIST nije uspio\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "ne mogu kreirati sandu��i��\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, fuzzy, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ne mogu kreirati sandu��i��\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "ne mogu obrisati sandu��i��\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "ne mogu dobiti omot\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "��aljem poruku (%d / %d bytea)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "do邸lo je do gre邸ke prilikom dobivanja omota.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ne mogu analizirati omot: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ne mogu se povezati s IMAP4 poslu転iteljom: %s%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, fuzzy, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ne mogu se povezati s IMAP4 poslu転iteljom: %s%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "ne mogu dobiti namespace\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "gre邸ka prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autorizacija"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login propao.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne mogu pri��vrstiti %s na %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 #, fuzzy
 msgid "(sending file...)"
 msgstr "��aljem DATA..."
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne mogu obilje転iti poruku %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne mogu kopirati %d u %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "gre邸ka prilikom imap naredbe: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "gre邸ka prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "gre邸ka prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr ""
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
@@ -300,25 +300,25 @@ msgstr "ne mogu skratiti sandu��i�� na nulu.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Izvozim poruke iz %s u %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ne mogu kopirati poruku %s u %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "Ne mogu otvoriti ozna��enu datoteku.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "izvorni spis jednak je destinaciji.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -327,7 +327,7 @@ msgstr ""
 "Datoteka `%s' ve�� postoji.\n"
 "Ne mogu stvoriti spis."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -339,77 +339,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "uspostavljam NNTP vezu s %s:%d ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP veza s %s:%d je pukla. Povezujem ponovo...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "��lanak %d ve�� je pohranjen.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "primam ��lanak %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "ne mogu pro��itati ��lanak %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "ne mogu poslati ��lanak.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "ne mogu primiti ��lanak %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "ne mogu odabrati grupu %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "pogre邸an opseg ��lanaka: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "nema novih ��lanaka.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "primam xover %d - %d u %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "ne mogu dobiti xover\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "do邸lo je do gre邸ke prilikom dobivanja xovera.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "pogre邸na xover linija: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "ne mogu dobiti xhdr\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "do邸lo je do gre邸ke prilikom dobivanja xhdra.\n"
 
@@ -492,7 +492,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "gre邸ka prilikom ovjeravanja\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "neuspjeh pri pisanju konfiguracije u datoteku\n"
@@ -524,12 +524,12 @@ msgstr "procmime_get_text_content(): Promjena koda nije uspjela.\n"
 msgid "can't open mark file\n"
 msgstr "ne mogu otvoriti obilje転enu datoteku\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ne mogu dohvatiti poruku %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Naredba za ispis nije dobra: `%s'\n"
@@ -700,7 +700,7 @@ msgstr ""
 msgid "Name"
 msgstr "Ime"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -1157,7 +1157,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Spis"
@@ -1191,7 +1191,7 @@ msgstr "Obavijest"
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "Gre邸ka"
 
@@ -1758,7 +1758,7 @@ msgstr "MIME tip"
 msgid "Size"
 msgstr "Veli��ina"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "Po邸alji"
@@ -1800,7 +1800,7 @@ msgid "Attach file"
 msgstr "Prilo転i datoteku"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "Potpis"
@@ -2017,7 +2017,7 @@ msgid " Check File "
 msgstr " Provjeri datoteku "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "Datoteka"
 
@@ -2095,7 +2095,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2160,7 +2160,7 @@ msgstr "Timeout (sek)"
 msgid "Maximum Entries"
 msgstr "Max. Unos"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "Osnovno"
 
@@ -2217,7 +2217,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Odaberite... "
 
@@ -2377,12 +2377,12 @@ msgstr "Postavljam info spisa...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info spisa..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretra転ujem spise %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretra転ujem spis %s ..."
@@ -2670,7 +2670,7 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Prev"
 msgstr "Postav"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "Slijede��a"
 
@@ -2693,207 +2693,207 @@ msgstr ""
 msgid "Sylpheed: %d new messages"
 msgstr "\t%d novih poruka\n"
 
-#: src/inc.c:388
+#: src/inc.c:433
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autorizacija"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "Primam nove poruke"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "Standby"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "Primam"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, fuzzy, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Ukloni poruke sa poslu転itelja nakon primanja"
 
-#: src/inc.c:615
+#: src/inc.c:660
 #, fuzzy
 msgid "Done (no new messages)"
 msgstr "Nema nepro��itanih poruka"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "Veza nije uspjela"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "Identifikacija nije uspjela"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:637
+#: src/inc.c:682
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, fuzzy, c-format
 msgid "Finished (%d new message(s))"
 msgstr "\t%d novih poruka\n"
 
-#: src/inc.c:690
+#: src/inc.c:735
 #, fuzzy
 msgid "Finished (no new messages)"
 msgstr "Nema nepro��itanih poruka"
 
-#: src/inc.c:699
+#: src/inc.c:744
 #, fuzzy
 msgid "Some errors occurred while getting mail."
 msgstr "Do邸lo je do gre邸aka prilikom primanja po邸te."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "primam nove poruke s ra��una %s...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autorizacija"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Primam nove poruke"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se na POP3 poslu転itelj: %s ..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, 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:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Primam broj novih poruka (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Primam broj novih poruka (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Primam broj novih poruka (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "Primam veli��inu poruka (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, fuzzy, c-format
 msgid "Deleting message %d"
 msgstr "Bri邸em poruke"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "Izlazim"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ukloni poruke sa poslu転itelja nakon primanja"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 #, fuzzy
 msgid "Connection failed."
 msgstr "Veza nije uspjela"
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "Do邸lo je do gre邸ke pri radu s po邸tom."
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, 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:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "Nema vi邸e mjesta na disku."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 #, fuzzy
 msgid "Can't write file."
 msgstr "Ne mogu pisati u datoteku.\n"
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 #, fuzzy
 msgid "Socket error."
 msgstr "protokol gre邸ka\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "Postavke sandu��i��a"
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Postavke sandu��i��a"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autorizacija"
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autorizacija"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 #, fuzzy
 msgid "Incorporation cancelled\n"
 msgstr "Prima novu po邸tu"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Primam nove poruke s %s u %s...\n"
@@ -3874,7 +3874,7 @@ msgstr "Prima novu po邸tu sa svih ra��una"
 msgid "Send queued message(s)"
 msgstr "��alje odlo転ene poruke"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Kreiraj"
@@ -3916,63 +3916,63 @@ msgstr "Bri邸e poruke"
 msgid "Set as junk mail"
 msgstr "Postavi kao uobi��ajeni"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "Izvr邸i"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "Izvr邸ava ozna��ene procese"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "Slijede��a nepro��itana poruka"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "Postav"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 #, fuzzy
 msgid "Common preferences"
 msgstr "Uobi��ajene postavke"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Ra��un"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "Postavke ra��una"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 #, fuzzy
 msgid "Command line options"
 msgstr "Ime zaglavlja nije postavljeno."
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3988,7 +3988,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4200,434 +4200,439 @@ msgstr ""
 "Pogre邸na lozinka! Poku邸ajte ponovo...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "Otvaram prozor za postavke ra��una...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "Ra��un%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "Postavke za novi ra��un"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Postavke ra��una"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "Kreiram prozor za postvake ra��una...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "Primanje"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "Privatnost"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "Ime ovog ra��una"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "Postavi kao uobi��ajeni"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "Osobne informacije"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "Puno ime"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "E-mail adresa"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "Organizacija"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "Informacije o poslu転itelju"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "Ni邸ta (lokalno)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "Ovaj server zahtijeva autorizaciju"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "News poslu転itelj"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "Poslu転itelj za primanje"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "SMTP poslu転itelj (slanje)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "ID korisnika"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "Lozinka"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Ovaj server zahtijeva autorizaciju"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "Ukloni poruke sa poslu転itelja nakon primanja"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 #, fuzzy
 msgid "Remove after"
 msgstr "Ukloni spis"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 #, fuzzy
 msgid "days"
 msgstr "Uvijek"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 msgid "0 days: remove immediately"
 msgstr ""
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Primi sve poruke sa poslu転itelja"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 #, fuzzy
 msgid "Receive size limit"
 msgstr "Prika転i dijalog primanja"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "Filtriraj poruke pri primanju"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "Uobi��ajeni sandu��i��"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nefiltrirane poruke biti ��e spremljene u ovaj spis)"
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 #, fuzzy
 msgid "Authentication method"
 msgstr "Autorizacija"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr ""
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "Filtriraj poruke pri primanju"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 #, 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:1024
+#: src/prefs_account_dialog.c:1030
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Nije upisan primatelj."
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 #, 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:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Zaglavlje"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "Dodaj polje Datum u zaglavlje"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "Generiraj ID poruke"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "Dodatna zaglavlja"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " Uredi... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "Autorizacija"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP autorizacija (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "Autoriziraj s POP3 prije slanja"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 #, fuzzy
 msgid "Command output"
 msgstr "Naredba"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Automatski postavi slijede��e adrese"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "Odvovori-Na"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "Uvijek potpi邸i poruke"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "Uvijek kriptiraj poruke"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 #, fuzzy
 msgid "Use clear text signature"
 msgstr "Unesi potpis"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "Klju�� potpisa"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "Koristi uobi��ajeni GnuPG klju��"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "Odaberi klju�� po e-mail adresi"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "Neki drugi klju��"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "ID klju��a ili korisnika:"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "Ne koristi SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "Koristi SSL za POP3 veze"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Korsiti STARTTLS naredbu za pokretanje SSL-a"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "Koristi SSL za IMAP4 veze"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 #, fuzzy
 msgid "Use SSL for NNTP connection"
 msgstr "Koristi SSL za SMTP veze"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "Slanje (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "Koristi SSL za SMTP veze"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "Specificirani SMTP port"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "Specificirani POP3 port"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "Specificirani IMAP4 port"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "Specificirani NNTP port"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "Specificirano ime domene"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "Direktorij IMAP poslu転itelja"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Primi sve poruke sa poslu転itelja"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 #, fuzzy
 msgid "Put sent messages in"
 msgstr "Spremi poslane poruke u poslano"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 #, fuzzy
 msgid "Put draft messages in"
 msgstr "Sa転mi poruke na"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Obri邸i poruku/e"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 #, fuzzy
 msgid "Put deleted messages in"
 msgstr "Obri邸i poruku/e"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 #, fuzzy
 msgid "Account name is not entered."
 msgstr "E-mail adresa nije upisana."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "E-mail adresa nije upisana."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "SMTP poslu転itelj nije upisan."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "ID korisnika nije upisan."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "POP3 poslu転itelj nije upisan."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 poslu転itelj nije upisan."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "NNTP poslu転itelj nije upisan."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6940,35 +6945,35 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/S_premi kao"
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Kreiranje nove po邸te"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Dod_aj po邸iljatelja u adresar"
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Uobi��ajene adrese"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 msgid "_Open with Web browser"
 msgstr ""
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6977,7 +6982,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index 68656ec2..7195c89c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2006-12-23 10:50+0100\n"
 "Last-Translator: N辿meth Tam叩s <ntomasz@vipmail.hu>\n"
 "Language-Team: HUNGARIAN <NONE>\n"
@@ -19,194 +19,194 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Be叩ll鱈t叩sok beolvas叩sa az 旦sszes hozz叩f辿r辿shez...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Az IMAP4 kapcsolat %s fel辿 megszakadt. ��jrakapcsol坦d叩s...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP szerver LOGIN kikapcsolva.\n"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "%s:%d IMAP4 kapcsolat l辿trehoz叩sa ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "Nem lehet TLS menetet ind鱈tani.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, c-format
 msgid "Getting message %d"
 msgstr "%d 端zenet let旦lt辿se"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "��zenetek hozz叩f撤z辿se ide: %s (%d / %d)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "%s 端zenetek 叩thelyez辿se ide: %s ..."
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "%s 端zenetek m叩sol叩sa ide: %s ..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "%s 端zenetek elt叩vol鱈t叩sa"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nem lehet be叩ll鱈tani a t旦r旦lt jelz辿st: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "nem lehet t旦r旦lni\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Minden 端zenet elt叩vol鱈t叩sa ebb��l: %s?"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nem lehet be叩ll鱈tani a t旦r旦lt jelz辿st: 1:*\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "mappa bez叩r叩sa nem siker端lt\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "%s root mappa nem l辿tezik\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "hiba t旦rt辿nt a LIST lek辿rdez辿se k旦zben.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "'%s' nem hozhat坦 l辿tre\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "'%s' nem hozhat坦 l辿tre a BEJ��V�� mappa alatt\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nem lehet l辿trehozni postal叩d叩t: LIST sikertelen\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "nem lehet l辿trehozni postal叩d叩t\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nem lehet a postal叩d叩t 叩tnevezni: %s -> %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "nem lehet t旦r旦lni a postal叩d叩t\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "a bor鱈t辿kot nem lehet megszerezni\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "��zenetfejl辿cek let旦lt辿se (%d / %d)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "hiba t旦rt辿nt a bor鱈t辿k fogad叩sa k旦zben.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "nem lehet 辿rtelmezni a bor鱈t辿kot: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "%s:%d IMAP4 szerverhez nem lehet kapcsol坦dni\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "IMAP4 szerverhez nem siker端lt kapcsol坦dni: %s:%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "n辿vt辿r nem el辿rhet��\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "%s mappa kiv叩laszt叩sa nem siker端lt\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 msgid "error on imap command: STATUS\n"
 msgstr "hiba az IMAP parancs k旦zben: STATUS\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 msgid "IMAP4 authentication failed.\n"
 msgstr "Az IMAP4 azonos鱈t叩s nem siker端lt.\n"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 bejelentkez辿s sikertelen.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s nem f撤zhet�� hozz叩 ehhez: %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(f叩jl k端ld辿se...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "端zenet nem f撤zhet�� hozz叩 ehhez: %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s nem m叩solhat坦 ide: %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "hiba az IMAP parancs k旦zben: STORE %s %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "hiba az IMAP parancs k旦zben: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 msgid "error while imap command: CLOSE\n"
 msgstr "hiba az IMAP parancs k旦zben: CLOSE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "az iconv nem tud UTF-7-b��l konvert叩lni ebbe: %s\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "az iconv nem tudja UTF-7-re konvert叩lni ezt: %s\n"
@@ -293,25 +293,25 @@ msgstr "nem lehet nulla m辿ret撤re v叩ltoztatni a postafi坦kot.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "��zenetek export叩l叩sa innen: %s ide: %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "%s 端zenet nem m叩solhat坦 ide: %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "A jel旦l�� f叩jlt nem lehet megnyitni.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "A forr叩s- 辿s c辿lmappa azonos.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "%s%c%d 端zenet m叩sol叩sa ide: %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -320,7 +320,7 @@ msgstr ""
 "`%s' f叩jl m叩r l辿tezik.\n"
 "Mappa nem hozhat坦 l辿tre."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -339,77 +339,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "NNTP kapcsolat l辿tes鱈t辿se %s:%d ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "Az NNTP kapcsolat %s:%d megszakadt. ��jrakapcsol坦d叩s...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "%d cikk m叩r a gyorst叩rban van.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "%d cikk fogad叩sa...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "%d cikk nem olvashat坦\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "A cikk nem k端ldhet�� el.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "%d cikket nem lehet fogadni\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "%s csoport nem v叩laszthat坦 ki\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "辿rv辿nytelen cikk tartom叩ny: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "Nincsenek 炭j cikkek.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "%d - %d h鱈rjegyz辿k fogad叩sa ide: %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "A h鱈rjegyz辿k nem el辿rhet��\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "Hiba a h鱈rjegyz辿k fogad叩sa k旦zben.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "辿rv辿nytelen h鱈rjegyz辿k sor: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "xhdr nem el辿rhet��\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "Hiba t旦rt辿nt xhdr v辿tele k旦zben.\n"
 
@@ -487,7 +487,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "hiba t旦rt辿nt a POP3 kapcsolat k旦zben\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "a be叩ll鱈t叩sokat nem lehetett elmenteni\n"
@@ -517,12 +517,12 @@ msgstr "procmime_get_text_content(): K坦d konverzi坦s hiba.\n"
 msgid "can't open mark file\n"
 msgstr "A kijel旦lt f叩jl nem nyithat坦 meg\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "%d 端zenet v辿tele nem siker端lt\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "��rv辿nytelen nyomtat坦 parancs: `%s'\n"
@@ -694,7 +694,7 @@ msgstr ""
 msgid "Name"
 msgstr "N辿v"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -1155,7 +1155,7 @@ msgid "Group"
 msgstr "Csoport"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Mappa"
@@ -1188,7 +1188,7 @@ msgstr "Megjegyz辿s"
 msgid "Warning"
 msgstr "Figyelmeztet辿s"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "Hiba"
 
@@ -1713,7 +1713,7 @@ msgstr "MIME t鱈pus"
 msgid "Size"
 msgstr "M辿ret"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "K端ld辿s"
@@ -1755,7 +1755,7 @@ msgid "Attach file"
 msgstr "F叩jl csatol叩sa"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "Al叩鱈r叩s"
@@ -1962,7 +1962,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:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "F叩jl"
 
@@ -2040,7 +2040,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2105,7 +2105,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:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "Alap"
 
@@ -2162,7 +2162,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Kiv叩laszt... "
 
@@ -2312,12 +2312,12 @@ msgstr "Mappa inform叩ci坦 be叩ll鱈t叩sa...\n"
 msgid "Setting folder info..."
 msgstr "Mappa inform叩ci坦 be叩ll鱈t叩sa..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa 叩tvizsg叩l叩sa..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa 叩tvizsg叩l叩sa..."
@@ -2590,7 +2590,7 @@ msgstr "LDIF f叩jl import叩l叩sa a c鱈mjegyz辿kbe"
 msgid "Prev"
 msgstr "El��z��"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "K旦vetkez��"
 
@@ -2611,142 +2611,142 @@ msgstr "V辿ge"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d 炭j 端zenet"
 
-#: src/inc.c:388
+#: src/inc.c:433
 msgid "Authenticating with POP3"
 msgstr "POP3 azonos鱈t叩s"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "��j 端zenetek fogad叩sa"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "K辿szenl辿t"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "Megszak鱈tva"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "Fogad叩s"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "K辿sz (%d 端zenet (%s) fogadott)"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "K辿sz (nincs 炭j 端zenet)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "Kapcsolat megszakadt"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "Azonos鱈t叩s nem siker端lt"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "Z叩rolt"
 
-#: src/inc.c:637
+#: src/inc.c:682
 msgid "Timeout"
 msgstr "Id��t炭ll辿p辿s"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "V辿ge (%d 炭j 端zenet)"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "V辿ge (nincs 炭j 端zenet)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "Hiba t旦rt辿nt a levelek fogad叩sakor."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, 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:739
+#: src/inc.c:784
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: POP3 azonos鱈t叩s"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: ��j 端zenetek fogad叩sa"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Kapcsol坦d叩s a(z) %s POP3 szerverhez ..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, 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:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Azonos鱈t叩s..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s 端zeneteinek fogad叩sa..."
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "��j 端zenetek sz叩m叩nak megszerz辿se (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "��j 端zenetek sz叩m叩nak megszerz辿se (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "��j 端zenetek sz叩m叩nak megszerz辿se (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "��j 端zenetek m辿ret辿nek megszerz辿se (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d 端zenet t旦rl辿se"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "Kil辿p辿s"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "��zenet v辿tele (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "��zenetek fogad叩sa (%d 端zenet (%s) fogadott)"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 msgid "Connection failed."
 msgstr "Kapcsolat megszakadt."
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "Hiba a levelek feldolgoz叩sa k旦zben."
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2755,28 +2755,28 @@ msgstr ""
 "Hiba a levelek feldolgoz叩sa k旦zben:\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "Nincs t旦bb szabad hely a lemezen."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "Nem lehet a f叩jlba 鱈rni."
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "Socket hiba."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr "A t叩voli f辿l bez叩rta a kapcsolatot."
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "A postafi坦k z叩rolt."
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2785,11 +2785,11 @@ msgstr ""
 "A postafi坦k z叩rolt:\n"
 "%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 msgid "Authentication failed."
 msgstr "Az azonos鱈t叩s nem siker端lt."
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2798,15 +2798,15 @@ msgstr ""
 "Az azonos鱈t叩s nem siker端lt:\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr "Menet id��t炭ll辿p辿se."
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "Fogad叩s megszak鱈tva\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s 炭j 端zeneteinek megszerz辿se %s mapp叩ba...\n"
@@ -3683,7 +3683,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:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "��j lev辿l"
@@ -3724,61 +3724,61 @@ msgstr "��zenet t旦rl辿se"
 msgid "Set as junk mail"
 msgstr "Lev辿lszem辿tk辿nt be叩ll鱈t叩s"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "Futtat叩s"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "Megjel旦lt processz futtat叩sa"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "K旦vetkez�� olvasatlan 端zenet"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "Be叩ll鱈t叩sok"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "K旦z旦s be叩ll鱈t叩sok"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Hozz叩f辿r辿s"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "Hozz叩f辿r辿s be叩ll鱈t叩sok"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "��n kapcsolat n辿lk端li m坦dban van. Kattintson az ikonra a kapcsol坦d叩shoz."
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr "��n kapcsol坦dva van. Kattintson az ikonra a kapcsolat n辿lk端li m坦dhoz."
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "Kil辿p辿s"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "Kil辿p辿s a programb坦l?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 msgid "Command line options"
 msgstr "Parancssori opci坦k"
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Haszn叩lat: sylpheed [OPCI��]..."
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3806,7 +3806,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4028,218 +4028,223 @@ msgstr ""
 "Hib叩s jelmondat! Pr坦b叩lja 炭jra...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "Hozz叩f辿r辿s be叩ll鱈t叩sok ablak megnyit叩sa...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "Hozz叩f辿r辿s%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "��j hozz叩f辿r辿s be叩ll鱈t叩sai"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Hozz叩f辿r辿s be叩ll鱈t叩sok"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "Hozz叩f辿r辿sbe叩ll鱈t叩sok ablak l辿trehoz叩sa...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "Fogad叩s"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "Mag叩nszf辿ra"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "Halad坦"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "Hozz叩f辿r辿s neve"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "Alap辿rtelmz辿sk辿nt be叩ll鱈t叩s"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "Szem辿lyes inform叩ci坦"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "Teljes n辿v"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "Email c鱈m"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "Szervezet"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "Szerver inform叩ci坦"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "H鱈rek (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "Semmi (helyi)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "Ezen a szerveren k旦telez�� az azonos鱈t叩s"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "H鱈rszerver"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "Szerver a fogad叩shoz"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "SMTP szerver (k端ld辿s)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "Felhaszn叩l坦i Azonos鱈t坦"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "Jelsz坦"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 msgid "Use secure authentication (APOP)"
 msgstr "Biztons叩gos hiteles鱈t辿s haszn叩lata (APOP)"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "��zenetek t旦rl辿se a szerverr��l fogad叩s ut叩n"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "Elt叩vol鱈t叩s ut叩na"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "nap"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 msgid "0 days: remove immediately"
 msgstr "0 nap: azonnal elt叩vol鱈tani"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 msgid "Download all messages (including already received) on server"
 msgstr ""
 "Minden 端zenet let旦lt辿se (bele辿rtve a m叩s let旦lt旦tteket is) a szerverr��l"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "Fogadott lev辿l m辿retkorl叩t"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "��zenetek sz撤r辿se fogad叩s k旦zben"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "Alap辿rtelmezett bej旦v�� postafi坦k"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 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:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "Azonos鱈t叩si m坦dszer"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
 msgstr "Csak az INBOX ellen��rz辿se fogad叩skor"
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "��zenetek sz撤r辿se fogad叩s k旦zben"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "H鱈rek"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 msgid "Maximum number of articles to download"
 msgstr "A let旦lteni k鱈v叩nt maxim叩lis cikkek sz叩ma"
 
-#: src/prefs_account_dialog.c:1024
+#: src/prefs_account_dialog.c:1030
 msgid "No limit if 0 is specified."
 msgstr "Ha 0 van megadva, akkor korl叩tlan."
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Fogad叩s mindr��l' ellen��rizze ezt a hozz叩f辿r辿st is"
 
-#: src/prefs_account_dialog.c:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Fejl辿c"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "D叩tum fejl辿c mez�� hozz叩ad叩s"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "��zenet-azonos鱈t坦 gener叩l叩sa"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "Felhaszn叩l坦 叩ltal defini叩lt fejl辿c hozz叩ad叩sa"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " Szerkeszt辿s... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "Azonos鱈t叩s"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Azonos鱈t叩s (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4247,197 +4252,197 @@ msgstr ""
 "Ha ezeket a mez��ket 端resen hagyja, a levelek fogad叩s叩hoz haszn叩lt "
 "felhaszn叩l坦i azonos鱈t坦 辿s jelsz坦 lesz haszn叩lva."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "Azonos鱈t叩s k端ld辿s el��tt POP3-mal"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr "K旦zvetlen bemenet"
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 msgid "Command output"
 msgstr "Parancskimenet"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 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:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "M叩solat"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Titkos m叩solat"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "V叩laszc鱈m"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "��zenetet mindig 鱈rja al叩 digit叩lisan"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "��zenetet mindig titkos鱈tsa"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr "Titkos鱈t叩s, ha titkos鱈tott 端zenetre v叩laszol"
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "ASCII-p叩nc辿lozott form叩tum haszn叩lata titkos鱈t叩shoz"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "Sz旦veges al叩鱈r叩s haszn叩lata"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "Digit叩lis al叩鱈r叩s kulcs"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "Alap辿rtelmezett GnuPG kulcs haszn叩lata"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "Kulcs v叩laszt叩sa az email c鱈me alapj叩n"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "Kulcs k辿zi megad叩sa"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "Felhaszn叩l坦 vagy kulcs Azonos鱈t坦:"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "Nem haszn叩l SSL-t"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "SSL haszn叩lata POP3 kapcsolathoz"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "STARTTLS parancs haszn叩lata SSL kapcsolat ind鱈t叩s叩hoz"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL haszn叩lata IMAP4 kapcsolathoz"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "SSL haszn叩lata NNTP kapcsolathoz"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "K端ld辿s (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "SSL haszn叩lata SMTP kapcsolathoz"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr "Nem-blokkol坦d坦 SSL haszn叩lata"
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 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:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "SMTP port megad叩sa"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "POP3 port megad叩sa"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "IMAP4 port megad叩sa"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "NNTP port megad叩sa"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "Tartom叩nyn辿v (domain) megad叩sa"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "IMAP szerver k旦nyvt叩r"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 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:1760
+#: src/prefs_account_dialog.c:1767
 msgid "Clear all message caches on exit"
 msgstr "Kil辿p辿skor t旦r旦l minden gyorst叩razott 端zenetet"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "Elk端ld旦tt 端zenetek elhelyez辿se"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "V叩zlatok elhelyez辿se"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 msgid "Put queued messages in"
 msgstr "V叩rakoz坦 端zenetek elhelyez辿se itt"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "T旦r旦lt 端zenetek elhelyez辿se"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "Hozz叩f辿r辿s n辿v nincs megadva."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "Nincs email c鱈m megadva."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "Nincs megadott SMTP szerver."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "Nincs felhaszn叩l坦i azonos鱈t坦 megadva."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "Nincs megadott POP3 szerver."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "Nincs megadott IMAP4 szerver."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "Nincs megadott NNTP szerver."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr "A megadott mappa nem egy v叩rakoz坦 mappa."
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6672,31 +6677,31 @@ msgstr ""
 "A sz旦vegtest nem jelen鱈thet�� meg, mert az ideiglenes f叩jl 鱈r叩sa nem "
 "siker端lt.\n"
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 msgid "Sa_ve this image as..."
 msgstr "A k辿p me_nt辿se mint..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "��_j 端zenet szerkeszt辿se"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 msgid "Add to address _book..."
 msgstr "Hozz叩ad叩s a _c鱈mjegyz辿khez..."
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 msgid "Copy this add_ress"
 msgstr "A c鱈_m m叩sol叩sa"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 msgid "_Open with Web browser"
 msgstr "M_egnyit叩s webb旦ng辿sz��vel"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr "A _hivatkoz叩s m叩sol叩sa"
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6708,7 +6713,7 @@ msgstr ""
 "l叩that坦 URL-t��l (%s).\n"
 "Ennek ellen辿re megnyitja?"
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr "Hamis URL figyelmeztet辿s"
 
diff --git a/po/it.po b/po/it.po
index d609b2d5..903167ba 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+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"
@@ -19,194 +19,194 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Lettura della configurazione per ogni account...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connessione IMAP4 a %s 竪 stata interrotta. Riconnessione...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Il server IMAP4 disabilita il LOGIN.\n"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "creazione della connessione IMAP4 a %s:%d ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "Impossibile avviare la sessione TLS.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, c-format
 msgid "Getting message %d"
 msgstr "Ricezione del messaggio %d"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Aggiunta di messaggi in %s (%d / %d)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Spostamento dei messaggi da %s in %s ..."
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copia dei messaggi da %s in %s ..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "Rimozione messaggi %s"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "impossibile impostare i flag eliminati: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "impossibile cancellare\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Rimozione di tutti i messaggi in %s"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "impossibile impostare i flag eliminati: 1:*\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "impossibile chiudere la cartella\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "la cartella radice %s non esiste\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "si 竪 verificato un errore durante la ricezione di LIST.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Impossibile creare 束%s損\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Impossibile creare 束%s損 sotto IN ENTRATA\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "impossibile creare la casella postale: LIST fallito\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "impossibile creare la casella postale\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "impossibile rinominare la casella postale: %s in %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "impossibile eliminare la casella postale\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "impossibile ricevere la busta\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Ricezione intestazioni del messaggio (%d / %d)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "si 竪 verificato un errore durante la ricezione della busta.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "impossibile analizzare la busta: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossibile connettersi al server IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Impossibile stabilire la sessione IMAP4 con: %s:%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "impossibile ricevere il namespace\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "impossibile selezionare la cartella: %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 msgid "error on imap command: STATUS\n"
 msgstr "errore durante il comando imap: STATUS\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autenticazione IMAP4 fallita.\n"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "Login IMAP4 fallito.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "impossibile aggiungere %s a %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(spedizione del file...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "impossibile aggiungere a %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "impossibile copiare %s in %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "errore durante il comando imap: STORE %s %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "errore durante il comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 msgid "error while imap command: CLOSE\n"
 msgstr "errore durante il comando imap: CLOSE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv non pu嘆 convertire UTF-7 in %s\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non pu嘆 convertire %s in UTF-7\n"
@@ -293,25 +293,25 @@ msgstr "impossibile troncare a zero la casella postale.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Esportazione dei messaggi da %s in %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "impossibile copiare il messaggio %s in %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "impossibile aprire il file delle segnature.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "la cartella sorgente 辿 identica a quella di destinazione.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copia del messaggio %s%c%d in %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -320,7 +320,7 @@ msgstr ""
 "Il file 束%s損 esiste gi��.\n"
 "Impossibile creare la cartella."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -339,77 +339,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "Creazione della connessione NNTP con %s:%d ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "La connessione NNTP a %s:%d 竪 stata interrotta. Riconnessione...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "l'articolo %d 竪 gi�� nella cache.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "ricezione dell'articolo %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "impossibile leggere l'articolo %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "impossibile inviare l'articolo.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "impossibile recuperare l'articolo %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "impossibile selezionare il gruppo: %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "intervallo di articoli non valido: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "non ci sono nuovi articoli.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "ricezione di xover %d - %d in %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "impossibile ricevere xover\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "si 竪 verificato un errore durante la ricezione di xover.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "riga xover non valida: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "impossibile ricevere xhdr\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "si 竪 verificato un errore durante la ricezione di xhdr.\n"
 
@@ -487,7 +487,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "si 竪 verificato un errore durante la sessione POP3\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "la scrittura della configurazione sul file 竪 fallita\n"
@@ -517,12 +517,12 @@ msgstr "procmime_get_text_content(): Conversione del codice fallita.\n"
 msgid "can't open mark file\n"
 msgstr "Impossibile aprire il file delle segnature\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "impossibile prelevare il messaggio %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La riga di comando di stampa non 竪 valida: 束%s損\n"
@@ -694,7 +694,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nome"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "Protocollo"
 
@@ -1159,7 +1159,7 @@ msgid "Group"
 msgstr "Gruppo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Cartella"
@@ -1192,7 +1192,7 @@ msgstr "Avviso"
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "Errore"
 
@@ -1719,7 +1719,7 @@ msgstr "Tipo MIME"
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "Invia"
@@ -1761,7 +1761,7 @@ msgid "Attach file"
 msgstr "Allega il file"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "Firma"
@@ -1968,7 +1968,7 @@ msgid " Check File "
 msgstr " Controllo file "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "File"
 
@@ -2047,7 +2047,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2112,7 +2112,7 @@ msgstr "Timeout (secondi)"
 msgid "Maximum Entries"
 msgstr "Numero massimo di voci"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "Essenziale"
 
@@ -2170,7 +2170,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Seleziona... "
 
@@ -2320,12 +2320,12 @@ msgstr "Impostazione delle informazioni della cartella...\n"
 msgid "Setting folder info..."
 msgstr "Impostazione delle informazioni della cartella..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
@@ -2599,7 +2599,7 @@ msgstr "Importazione del file LDIF nella rubrica"
 msgid "Prev"
 msgstr "Precedente"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "Successivo"
 
@@ -2620,143 +2620,143 @@ msgstr "Fine"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nuovi messaggi"
 
-#: src/inc.c:388
+#: src/inc.c:433
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autenticazione"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "Recupero i nuovi messaggi"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "Attesa"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "Cancellato"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "Recupero"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Fatto (ricevuti %d messaggio(i) (%s))"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "Fatto (non ci sono nuovi messaggi)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "Connessione fallita"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "Autenticazione fallita"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "Bloccato"
 
-#: src/inc.c:637
+#: src/inc.c:682
 msgid "Timeout"
 msgstr "Timeout"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finito (%d nuovo(i) messaggio(i))"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "Finito (non ci sono nuovi messaggi)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "Ci sono stati degli errori durante la ricezione della posta."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "ricezione dei nuovi messaggi dell'account %s...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autenticazione"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recupero i nuovi messaggi"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Connessione al server POP3: %s..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossibile connettersi al server POP3: %s:%d\n"
 
-#: src/inc.c:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Autenticazione..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Ricezione dei messaggi da %s..."
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Ricezione del numero dei nuovi messaggi (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Ricezione del numero dei nuovi messaggi (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Ricezione del numero dei nuovi messaggi (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "Ricezione della dimensione dei messaggi (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "Eliminazione del messaggio %d"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "Esco"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recupero il messaggio (%d di %d) (%s di %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ricezione di (%d messaggio(i) ricevuti (%s))"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 msgid "Connection failed."
 msgstr "Connessione fallita."
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "Si 竪 verificato un errore durante l'elaborazione della posta."
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2765,28 +2765,28 @@ msgstr ""
 "Si 竪 verificato un errore durante l'elaborazione della posta:\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "Spazio su disco esaurito."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "Impossibile scrivere il file."
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "Errore del socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr "Connessione chiusa dall'host remoto."
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "La casella postale 竪 bloccata."
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2795,11 +2795,11 @@ msgstr ""
 "La casella postale 竪 bloccata:\n"
 "%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 msgid "Authentication failed."
 msgstr "Autenticazione fallita."
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2808,15 +2808,15 @@ msgstr ""
 "Autenticazione fallita:\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr "La sessione 竪 andata in timeout."
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "Incorporazione cancellata\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Ricezione in %s dei nuovi messaggi da %s...\n"
@@ -3695,7 +3695,7 @@ msgstr "Include la nuova posta di tutti gli account"
 msgid "Send queued message(s)"
 msgstr "Invia i messaggi accodati"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Componi"
@@ -3736,60 +3736,60 @@ msgstr "Elimina il messaggio"
 msgid "Set as junk mail"
 msgstr "Imposta come mail spazzatura"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "Esegui"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "Esegue le operazioni segnate"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "Successivo messaggio non letto"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "Preferenze"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "Preferenze comuni"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "Impostazione dell'account"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr "Siete offline. Fare click sull'icona per andare online."
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr "Siete online. Fare click sull'icona per andare offline."
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "Esci"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "Uscire da questo programma?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 msgid "Command line options"
 msgstr "Opzioni della linea di comando"
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPZIONE]..."
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3817,7 +3817,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4038,219 +4038,224 @@ msgstr ""
 "Passphrase sbagliata! Provare ancora...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "Apertura della finestra delle preferenze degli account...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "Preferenze per il nuovo account"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Preferenze dell'account"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "Creazione della finestra delle preferenze degli account...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "Ricevi"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "Avanzato"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "Nome di questo account"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "Imposta come predefinito"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "Informazioni personali"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "Nome completo"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "Indirizzo di posta"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "Informazioni sui server"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
 # src/prefs_account.c:634 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "Nessuno (locale)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "Questo server richiede l'autenticazione"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "Server delle news"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "Server per la ricezione"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "Server SMTP (spedisce)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "User ID"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "Password"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 msgid "Use secure authentication (APOP)"
 msgstr "Usa l'autenticazione sicura (APOP)"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "Rimuovi i messaggi sul server dopo averli ricevuti"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "Rimuovi dopo "
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr " giorni"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 msgid "0 days: remove immediately"
 msgstr "0 giorni: rimuovi immediatamente"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Scarica tutti i messaggi sul server"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "Limite della dimensione da ricevere di"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "Filtra i messaggi in ricezione"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "Inbox predefinita"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "I messaggi non filtrati saranno memorizzati in questa cartella."
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "Metodo di autenticazione"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "Automatico"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
 msgstr "Controlla solo 束In entrata損 in ricezione"
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "Filtra i messaggi in ricezione"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 msgid "Maximum number of articles to download"
 msgstr "Numero massimo di articoli da scaricare"
 
-#: src/prefs_account_dialog.c:1024
+#: src/prefs_account_dialog.c:1030
 msgid "No limit if 0 is specified."
 msgstr "Nessun limite se viene specificato 0."
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 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:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Intestazione"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "Aggiungi il campo Data nell'intestazione"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "Genera ID messaggio"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "Aggiungi un'intestazione definita dall'utente"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " Modifica... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticazione SMTP (SMTP AUT)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4258,197 +4263,197 @@ msgstr ""
 "Lasciando vuote queste voci verranno usate la stessa user ID e password "
 "della ricezione."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentica con POP3 prima dell'invio"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 msgid "Command output"
 msgstr "Output del comando"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Imposta automaticamente i seguenti indirizzi"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "Rispondi a"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "Firma il messaggio per predefinizione"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "Cifra il messaggio per predefinizione"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr "Cifra quando rispondi a un messaggio cifrato"
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "Usa il formato ASCII-armato per la cifratura"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "Usa la firma con il testo in chiaro"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "Chiave della firma"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "Usa la chiave predefinita di GnuPG"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "Scegli la chiave per il tuo indirizzo email"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "Specifica la chiave manualmente"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "ID user o chiave:"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "Non usare SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "Usa SSL per la connessione POP3"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usa il comando STARTTLS per iniziare la sessione SSL"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usa SSL per la connessione IMAP4"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "Usa SSL per la connessione NNTP"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "Invio (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "Usa SSL per la connessione SMTP"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr "Usa SSL non bloccato"
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 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:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "Specifica la porta SMTP"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "Specifica la porta POP3"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "Specifica la porta IMAP4"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "Specifica la porta NNTP"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "Specifica il nome di dominio"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "Directory del server IMAP4"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Verranno visualizzate solo le sottocartelle di questa directory."
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 msgid "Clear all message caches on exit"
 msgstr "Pulisci tutte le cache dei messaggi all'uscita"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "Metti i messaggi spediti in"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "Metti i messaggi abbozzati in"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 msgid "Put queued messages in"
 msgstr "Metti i messaggi accodati in"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "Metti i messaggi eliminati in"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "Non 竪 stato immesso il nome dell'account."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "Non 竪 stato immesso l'indirizzo di posta."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "Non 竪 stato immesso il server SMTP."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "Non 竪 stato immesso lo user ID."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "Non 竪 stato immesso il server POP3."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "Non 竪 stato immesso il server IMAP4."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "Non 竪 stato immesso il server NNTP."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr "La cartella specificate non 竪 una cartella 束Coda損."
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6686,31 +6691,31 @@ msgstr ""
 "Il corpo del testo non pu嘆 essere mostrato perch辿 la scrittura sul file "
 "temporaneo 竪 fallita \n"
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 msgid "Sa_ve this image as..."
 msgstr "Sa_lva questa immagine come..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Componi un n_uovo messaggio"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 msgid "Add to address _book..."
 msgstr "Aggiungi alla ru_brica..."
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 msgid "Copy this add_ress"
 msgstr "Copia questo indi_rizzo"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 msgid "_Open with Web browser"
 msgstr "Apri c_on il browser web"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr "Copia questo _link"
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6723,7 +6728,7 @@ msgstr ""
 "\n"
 "Aprirlo comunque?"
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr "Avvertimento falsificazione URL"
 
diff --git a/po/ja.po b/po/ja.po
index bb402977..6ef91359 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 1999-10-12\n"
 "Last-Translator: Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -18,194 +18,194 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "�����鴻�������≪�������潟��罸����荐�絎����茯���粋昭��推賢...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "%s ��吾��IMAP4����･膓������������������障���������･膓������障��...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP��泣�若����� LOGIN �����≦�鴻�������������障�����\n"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "%s:%d ��吾��IMAP4����･膓����腆榊��筝�...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "TLS ��祉����激�с�潟�����紮���с����障��������\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, c-format
 msgid "Getting message %d"
 msgstr "��＜����祉�若�� %d ������緇�筝�"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "��＜����祉�若�吾�� %s ���菴遵�������������障�� (%d / %d)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "��＜����祉�若�� %s ��� %s ���腱糸�������������障��..."
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "��＜����祉�若�� %s ��� %s �����潟����若����������障��..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "��＜����祉�若�� %s ��������ゃ����������障��"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "deleted ��������違����祉�������с����障�����: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "expunge ��с����障�����\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "%s ��������鴻�������＜����祉�若�吾�������ゃ����������障��"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "deleted ��������違����祉�������с����障�����: 1:*\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "�����������������������若�冴�с����障�����\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "�����若�������������� %s ���絖���������障�����\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "LIST ������緇�筝������������若����榊�������障��������\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "'%s' ���篏������с����障��������\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "INBOX ���筝���� '%s' ���篏������с����障��������\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "��＜�若�������������鴻��篏������с����障�����: LIST ���紊掩��\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "��＜�若�������������鴻��篏������с����障�����\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "��＜�若�������������鴻�����腱医����眼�с����障�����: %s -> %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "��＜�若�������������鴻�������ゃ�с����障�����\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "�����潟�������若��������緇���с����障�����\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "��＜����祉�若�吾�����������������緇�筝� (%d / %d)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "�����潟�������若��������緇�筝������������若����榊�������障��������\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "�����潟�������若�����茹ｆ����с����障�����: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4 ��泣�若��: %s:%d ����･膓���с����障�����\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "%s:%d ������ IMAP4 ��祉����激�с�潟��腆榊����с����障�����\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "namespace ������緇���с����障�����\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "������������ %s �����御����с����障�����\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 msgid "error on imap command: STATUS\n"
 msgstr "imap ��潟����潟��筝�������������: STATUS\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 ���茯�荐若��紊掩�������障��������\n"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4��������違�ゃ�潟��紊掩�������障��������\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s ��� %s ���菴遵����с����障�����\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(�����＜�ゃ��������篆＞賢...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "��＜����祉�若�吾�� %s ���菴遵����с����障�����\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s ��� %s �����潟����若�с����障�����\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap ��潟����潟��筝�������������: STORE %s %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap ��潟����潟��筝�������������: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 msgid "error while imap command: CLOSE\n"
 msgstr "imap ��潟����潟��筝�������������: CLOSE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ��� UTF-7 ��� %s ���紊������с����障�����\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ��� %s ��� UTF-7 ���紊������с����障�����\n"
@@ -292,25 +292,25 @@ msgstr "��＜�若�������������鴻����若�����������荅違����������障��������\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "��＜����祉�若�吾�� %s ������ %s �����吾����冴����������障��...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "��＜����祉�若�� %s ��� %s �����潟����若�с����障�����\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "�����若�������＜�ゃ�������������障��������\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "腱糸��������������������腱糸�����������筝���с�����\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "��＜����祉�若�� %s%c%d ��� %s �����潟����若����������障��...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -319,7 +319,7 @@ msgstr ""
 "�����＜�ゃ�� `%s' ��������с��絖���������障�����\n"
 "���������������篏������с����障��������"
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -338,77 +338,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "%s:%d ��吾�� NNTP ����･膓����腆榊��筝�...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "%s:%d ��吾�� NNTP ����･膓������������������障���������･膓������障��...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "%d ������荐�篋���������с�������ｃ����激�ャ�������������障�����\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "%d ������荐�篋�������緇������������障��...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "%d ������荐�篋����茯������障�����\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "荐�篋���������鴻����с����障��������\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "%d ������荐�篋�������緇���с����障�����\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "��違����若�������御����с����障�����: %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "��≦�鴻��荐�篋����膀���蚊�с��: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "��亥��荐�篋������������障��������\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "xover %d - %d ������緇�筝� (%s)...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "xover �����宴�����緇���с����障�����\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "xover �����宴�����緇�筝������������若����榊�������障��������\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "��≦�鴻�� xover 茵���с��: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "xhdr �����宴�����緇���с����障�����\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "xhdr �����宴�����緇�筝������������若����榊�������障��������\n"
 
@@ -486,7 +486,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "POP3 ��祉����激�с�割賢�����������若����榊�������障�����\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "荐�絎���������＜�ゃ����吾����吾��莨若�帥��紊掩�������障�����\n"
@@ -516,12 +516,12 @@ msgstr "procmime_get_text_content(): ��潟�若��紊�������紊掩�������障��������\n"
 msgid "can't open mark file\n"
 msgstr "�����若�������＜�ゃ�������������障�����\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "��＜����祉�若�� %d ���������莨若����障�����\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "��医�激����潟����潟�������ゃ�潟����≦�鴻�с��: `%s'\n"
@@ -691,7 +691,7 @@ msgstr ""
 msgid "Name"
 msgstr "������"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "�����������潟��"
 
@@ -1153,7 +1153,7 @@ msgid "Group"
 msgstr "��違����若��"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "������������"
@@ -1186,7 +1186,7 @@ msgstr "羈����"
 msgid "Warning"
 msgstr "茘����"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "���������"
 
@@ -1709,7 +1709,7 @@ msgstr "MIME ��帥�ゃ��"
 msgid "Size"
 msgstr "��泣�ゃ��"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "���篆�"
@@ -1751,7 +1751,7 @@ msgid "Attach file"
 msgstr "�����＜�ゃ�����羞私��"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "臀峨��"
@@ -1958,7 +1958,7 @@ msgid " Check File "
 msgstr " �����＜�ゃ����������с����� "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "�����＜�ゃ��"
 
@@ -2036,7 +2036,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2101,7 +2101,7 @@ msgstr "��帥�ゃ����≪�����(腱�)"
 msgid "Maximum Entries"
 msgstr "���紊с����潟��������"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "��堺��"
 
@@ -2158,7 +2158,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " ��御��... "
 
@@ -2308,12 +2308,12 @@ msgstr "�����������������宴��荐�絎�筝�...\n"
 msgid "Setting folder info..."
 msgstr "�����������������宴��荐�絎�筝�..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "�����������������鴻����ｃ�割賢 (%s%c%s) ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "�����������������鴻����ｃ�割賢 (%s)..."
@@ -2586,7 +2586,7 @@ msgstr "LDIF�����＜�ゃ�������≪�������劫験��吾�ゃ�潟����若��"
 msgid "Prev"
 msgstr "������"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "罨＜��"
 
@@ -2607,142 +2607,142 @@ msgstr "絎�篋�"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d ��������亥����＜����祉�若��"
 
-#: src/inc.c:388
+#: src/inc.c:433
 msgid "Authenticating with POP3"
 msgstr "POP3��ц��荐寂賢"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "��亥����＜����祉�若�吾�����篆＞賢"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "緇�罘�筝�"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "�����ｃ�潟�祉��"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "���篆＞賢"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "絎�篋� (%d ��� (%s) ���篆�)"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "絎�篋� (��亥����＜����祉�若�吾�����)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "�･膓�紊掩��"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "茯�荐弱け���"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "���������筝�"
 
-#: src/inc.c:637
+#: src/inc.c:682
 msgid "Timeout"
 msgstr "��帥�ゃ����≪�����"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "絎�篋� (%d ��������亥����＜����祉�若��)"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "絎�篋� (��亥����＜����祉�若�吾�����)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "��＜�若��������緇�筝������������若����榊�������障��������"
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "��≪�������潟�� %s �����亥����＜����祉�若�吾��������莨若����с����障��...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: POP3��ц��荐寂賢"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: ��亥����＜����祉�若�吾�����篆＞賢"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3��泣�若��: %s ����･膓�筝�..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3��泣�若��: %s:%d ����･膓���с����障�����\n"
 
-#: src/inc.c:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "茯�荐寂賢..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s ��������＜����祉�若�吾�����篆＞賢..."
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "��亥����＜����祉�若�吾����違�����緇�筝� (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "��亥����＜����祉�若�吾����違�����緇�筝� (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "��亥����＜����祉�若�吾����違�����緇�筝� (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "��＜����祉�若�吾����泣�ゃ�冴�����緇�筝� (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "��＜����祉�若�� %d ��������や賢"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "������筝�"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "��＜����祉�若�吾�����篆＞賢 (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "���篆＞賢 (%d ��� (%s) ���篆�)"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 msgid "Connection failed."
 msgstr "�･膓����紊掩�������障��������"
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "��＜�若�����������筝������������若����榊�������障��������"
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2751,28 +2751,28 @@ msgstr ""
 "��＜�若�����������筝������������若����榊�������障�����:\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "�����ｃ�鴻�����腥冴��絎拷�������������障��������"
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "�����＜�ゃ�������吾��莨若����障��������"
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "��純�宴�������������若�с�����"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr "�����≪�若�������鴻����������ｃ���･膓������������������障��������"
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "��＜�若�������������鴻�������������������������障�����"
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2781,11 +2781,11 @@ msgstr ""
 "��＜�若�������������鴻�������������������������障��:\n"
 "%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 msgid "Authentication failed."
 msgstr "茯�荐若��紊掩�������障��������"
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2794,15 +2794,15 @@ msgstr ""
 "茯�荐若��紊掩�������障�����:\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr "��祉����激�с�潟����帥�ゃ����≪����������障��������"
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "���篆＜�������ｃ�潟�祉�������障�����\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "��違�������＜����祉�若�吾�� %s ������ %s ���������莨若����с����障��...\n"
@@ -3677,7 +3677,7 @@ msgstr "�����≪�������潟�������亥����＜�若��������莨�"
 msgid "Send queued message(s)"
 msgstr "���篆≦��罘�筝������＜����祉�若�吾�����篆＜�����"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "篏����"
@@ -3718,60 +3718,60 @@ msgstr "��＜����祉�若�吾�������ゃ�����"
 msgid "Set as junk mail"
 msgstr "菴傑����＜�若��������絎�"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "絎�茵�"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "�����若��������������������絎�茵�"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "罨＜�����茯���＜����祉�若��"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "荐�絎�"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "���������荐�絎�"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "��≪�������潟��"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "��≪�������潟�����荐�絎�"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr "�憜�������������ゃ�潟�с�������≪�ゃ�潟�潟����������������������������潟����ゃ�潟����������障�����"
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr "�憜�������潟����ゃ�潟�с�������≪�ゃ�潟�潟����������������������������������ゃ�潟����������障�����"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "腟�篋�"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "��������������違��������腟�篋������障�����?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 msgid "Command line options"
 msgstr "��潟����潟�������ゃ�潟�������激�с��"
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "篏睡��羈�: sylpheed [��������激�с��]..."
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3799,7 +3799,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4020,414 +4020,418 @@ msgstr ""
 "筝�罩ｃ�������鴻�������若�冴�с��! �����ュ��������筝�������...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "��≪�������潟�������������＜����潟�鴻����ｃ�潟����������������������障��...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "��域����≪�������潟�����荐�絎�"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "��≪�������潟�����荐�絎�"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "��≪�������潟�������������＜����潟�鴻����ｃ�潟��������篏����筝�...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "���篆�"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "���篋堺�����"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "蕭�綺����荐�絎�"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "��������≪�������潟��������腱�"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "���絽娯戎���"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "���篋堺�����"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "������"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "��＜�若����≪��������"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "腟�膵�"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "��泣�若��������"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "�����ャ�若�� (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "������ (�����若�����)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "��������泣�若�����茯�荐若��綽�荀�"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "�����ャ�若�鴻�泣�若��"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "���篆∞����泣�若��"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "SMTP��泣�若�� (���篆�)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "�����若��ID"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "�����鴻����若��"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 msgid "Use secure authentication (APOP)"
 msgstr "絎�������茯�荐惹�劫�����篏睡�������� (APOP)"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "���篆≧�������泣�若��筝������＜����祉�若�吾�������ゃ�����"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "��＜����祉�若�吾��"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "��ュ�����������"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 msgid "0 days: remove immediately"
 msgstr "0���: ��喝婚���������"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 msgid "Download all messages (including already received) on server"
 msgstr "���篆≧����帥�������������泣�若��筝���������鴻�������＜����祉�若�吾�����篆＜�����"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "���篆＜�泣�ゃ�阪�狗��"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "���篆≧�������＜����祉�若�吾�����������������"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "罔�羣�������篆∞��"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "��������������������������ｃ����＜����祉�若�吾�������������������������主����������障�����"
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "茯�荐惹�劫��"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "������"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
 msgstr "���篆≧��������篆∞��(INBOX)�����帥����с�����������"
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+msgid "Filter new messages in INBOX on receiving"
+msgstr "���篆≧��������篆∞��(INBOX)��������亥����＜����祉�若�吾�����������������"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "�����ャ�若��"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 msgid "Maximum number of articles to download"
 msgstr "��������潟����若��������荐�篋���違��筝����"
 
-#: src/prefs_account_dialog.c:1024
+#: src/prefs_account_dialog.c:1030
 msgid "No limit if 0 is specified."
 msgstr "0������絎������������≦�狗�������������障�����"
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 msgid "`Get all' checks for new messages on this account"
 msgstr "���������篆＜����с�������≪�������潟�������亥����＜����祉�若�吾�������с�����������"
 
-#: src/prefs_account_dialog.c:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "���������"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "Date��������������ｃ�若��������篁�������"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "��＜����祉�若��ID���������������"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "�����若�九��臂����������������菴遵��������"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " 膩����... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "茯�荐�"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP茯�荐� (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
 "�����������潟��������腥冴�����������������篆≧����������������若��ID��������鴻����若�����篏睡����������障�����"
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "���篆≦�����POP3茯�荐若��茵����"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr "��贋･��ュ��"
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 msgid "Command output"
 msgstr "��潟����潟�������阪��"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "篁ヤ�������≪�������鴻�����������絎�"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "罔�羣���с�＜����祉�若�吾��臀峨��������"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "罔�羣���с�＜����祉�若�吾������垸��������"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr "����垸�������������＜����祉�若�吾��菴�篆＜�������翫���������垸��������"
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "����垸�����ASCII���茖�綵√�����篏睡��������"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "��������≪�������鴻��臀峨�����篏睡��������"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "臀峨�����"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "罔�羣����GnuPG��泣��篏睡��������"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "�����������糸����＜�若����≪�������鴻�ч�泣����御��������"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "��泣����������ф��絎�������"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "�����若�吟�障��������ID:"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "SSL���篏睡�����������"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "POP3����･膓����SSL���篏睡��"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "SSL��祉����激�с�潟�����紮����STARTTLS��潟����潟�����篏睡��"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "IMAP4����･膓����SSL���篏睡��"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "NNTP����･膓����SSL���篏睡��"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "���篆� (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "SMTP����･膓����SSL���篏睡��"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr "�����������������潟��SSL���篏睡��������"
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "SSL����･膓������馹���������������翫�����������������������������������"
 
-#: src/prefs_account_dialog.c:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "SMTP�����若��������絎�"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "POP3�����若��������絎�"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "IMAP4�����若��������絎�"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "NNTP�����若��������絎�"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "�����＜�ゃ�喝��������絎�"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "IMAP��泣�若�������ｃ�����������"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "�����������ｃ����������������泣�������������������帥��茵�腓冴�������障�����"
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 msgid "Clear all message caches on exit"
 msgstr "腟�篋������������鴻�������＜����祉�若�吾�������ｃ����激�ャ����������≪�����"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "���篆≧ｧ�����������������贋��"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "���腮帥����������������贋��"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 msgid "Put queued messages in"
 msgstr "���篆≦����＜����������������贋��"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "�����睡�宴����������������贋��"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "��≪�������潟����������ュ����������������障��������"
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "��＜�若����≪�������鴻����ュ����������������障��������"
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "SMTP��泣�若�������ュ����������������障��������"
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "�����若��ID�����ュ����������������障��������"
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "POP3��泣�若�������ュ����������������障��������"
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4��泣�若�������ュ����������������障��������"
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "NNTP��泣�若�������ュ����������������障��������"
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr "���絎�������������������������篆≦����＜�������������с����������障��������"
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6655,31 +6659,31 @@ msgstr ""
 "筝���������＜�ゃ����吾����吾��莨若�帥��紊掩�������������������������＜����祉�若�御��������茵�腓冴�с����障��������"
 "���������\n"
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 msgid "Sa_ve this image as..."
 msgstr "��糸�����篆�絖�(_V)..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "��域����＜����祉�若�吾��篏����(_N)"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 msgid "Add to address _book..."
 msgstr "��≪�������劫験���菴遵��(_B)..."
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 msgid "Copy this add_ress"
 msgstr "��≪�������鴻����潟�����(_R)"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 msgid "_Open with Web browser"
 msgstr "Web�����������吟�ч�����(_O)"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr "�����潟�������潟�����(_L)"
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6692,7 +6696,7 @@ msgstr ""
 "\n"
 "��������������������障�����?"
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr "��処��URL���茘����"
 
diff --git a/po/ko.po b/po/ko.po
index 70873034..dabed205 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2002-12-02 11:09+0900\n"
 "Last-Translator: Nam SungHyun <namsh@kldp.org>\n"
 "Language-Team: Korean <gnome-kr-translation@lists.sourceforge.net>\n"
@@ -18,201 +18,201 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "螳� 螻������������� 覈���� ��れ����� ��曙�給�����...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "%s:%d��������� IMAP4 ��������� �����伎����給�����. ��れ�� ������...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP ���覯� ���������襴�"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "%s:%d��������� IMAP4 ��������� 襷���������� ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "TLS ��語����� ��������� ��� �����給�����.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "%d 覃����讌�襯� ������������ 譴�"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "覃����讌�襯� 覲企�企�� 譴� (%d / %d 覦���危��)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "覃����讌� %s%c%d襯� %s襦� ��企�����������...\n"
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "覃����讌� %s%c%d襯� %s襦� 覲旧��譴���������� ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "%s襦�覿���� %s襦� 覃����讌�襯� 螳���語�給�����...\n"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "������ ������蠏碁ゼ ��れ����� ���螳� �����給�����: %d\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "讌���� ���螳� �����給�����\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "%s襦�覿���� %s襦� 覃����讌�襯� 螳���語�給�����...\n"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "������ ������蠏碁ゼ ��れ����� ���螳� �����給�����: 1:%d\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "�启��襯� ��������� ���螳� �����給�����: %s\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "������ �����殊�� 覦�蟆����讌�������.\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "LIST襯� ��視�� ���譴� ������螳� 覦����.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "'%s'襯� �����燕�� ���螳� �����給�����\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "INBOX ��������� '%s'襯� �����燕�� ���螳� �����給�����\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "��壱ｸ������ �����燕�� ��� �����給�����: LIST ��ろ��\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "��壱ｸ������ �����燕�� ��� �����給�����\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "��壱ｸ���覈���� 覦�蠖� ��� �����給�����: %s������ %s襦�\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "��壱ｸ������ ��������� ��� �����給�����\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "envelope襯� ��詞�� ���螳� �����給�����\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "覃����讌�襯� 覲企�企�� 譴� (%d / %d 覦���危��)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "envelope襯� ��視�� 譴� ������ 覦����.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "envelope襯� �����燕�� ���螳� �����給�����: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "%s:%d IMAP4 ���覯���� ��郁屋��� ���螳� �����給�����\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "IMAP4 ��語����� 襷���� ��� �����給�����: %s: %d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "namespace襯� ��詞�� ��� �����給�����\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "�启��襯� ��������� ���螳� �����給�����: %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "imap 覈���轟�� ��ろ��譴� ������: EXPUNGE\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "��語�� 覦�覯�"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 襦�蠏語�語�� ��ろ�������給�����.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s襯� %s��� 覿���� ��� �����給�����\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(�����殊�� 覲企��������...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "%s 覃����讌�襯� 豢�螳���� ���螳� �����給�����\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%d襯� %s襦� 覲旧����� ���螳� �����給�����\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap 覈���轟�� ��ろ��譴� ������: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap 覈���轟�� ��ろ��譴� ������: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "imap 覈���轟�� ��ろ��譴� ������: EXPUNGE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv螳� UTF-7襯� %s襦� 覲������� ��� �����給�����\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv螳� %s襯� UTF-7襦� 覲������� ��� �����給�����\n"
@@ -299,25 +299,25 @@ msgstr "覃���朱����れ�� ���蠍磯ゼ 0��朱�� 襷���れ��螳� �����給�����.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "覃����讌�襯� %s������ %s襦� 覲企��������...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "覃����讌� %s��� %s襦� 覲旧����� ���螳� �����給�����\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "������ �����殊�� ��� ���螳� �����給�����.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "���蠍� �启����� ���蟆�讌� �启��螳� 螳���給�����.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "覃����讌� %s%c%d襯� %s襦� 覲旧��譴���������� ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -326,7 +326,7 @@ msgstr ""
 "������ `%s'螳� ��企�� 譟伎�����������.\n"
 "�启��襯� �����燕�� ���螳� �����給�����."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -338,77 +338,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "%s:%d襦� NNTP ��������� �����燕��������...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "%s:%d襦���� NNTP ��郁屋��� �����伎����給�����. ��れ�� ��郁屋���������...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "蠍一�� %d��� ��企�� 貂������������給�����.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "蠍一�� %d襯� ��詞�給�����...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "蠍一�� %d襯� ��曙�� ���螳� �����給�����\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "蠍一��襯� ���襴� ���螳� �����給�����.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "蠍一�� %d襯� 螳���語�� ���螳� �����給�����\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "%s 蠏碁９��� ��������� ���螳� �����給�����\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "���覦�襯伎�������� 蠍一�� 覯����: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "��� 蠍一��螳� �����給�����.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "%3$s������ %1$d - %2$d xover襯� 螳���語��...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "xover襯� 螳���語�� ���螳� �����給�����\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "xover襯� ��視�� ���譴� ������螳� 覦����.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "���覦�襯伎�������� xover line: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "xhdr��� 螳���語�� ���螳� �����給�����\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "xhdr��� ��視�� ���譴� ������螳� 覦����.\n"
 
@@ -489,7 +489,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "��語�� ���譴� ������ 覦����\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "�����殊�� ��れ����� ��郁鍵螳� ��ろ�������給�����\n"
@@ -521,12 +521,12 @@ msgstr "procmime_get_text_content(): 貊���� 覲������� ��ろ�������給�����.\n"
 msgid "can't open mark file\n"
 msgstr "������ �����殊�� ��伎��螳� �����給�����\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "覃����讌� %d襯� 螳���語�� ���螳� �����給�����\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "��語�� 覈���轟�願�� ���覦�襯伎�������給�����: `%s'\n"
@@ -684,7 +684,7 @@ msgstr ""
 msgid "Name"
 msgstr "��企��"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "���襦����貊�"
 
@@ -1144,7 +1144,7 @@ msgid "Group"
 msgstr "蠏碁９"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "�启��"
@@ -1177,7 +1177,7 @@ msgstr "���襴�"
 msgid "Warning"
 msgstr "蟆所��"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "������"
 
@@ -1733,7 +1733,7 @@ msgstr "襷���� ������"
 msgid "Size"
 msgstr "���蠍�"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "覃���� 覦����"
@@ -1775,7 +1775,7 @@ msgid "Attach file"
 msgstr "������ 豌�覿�"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "���覈�"
@@ -1990,7 +1990,7 @@ msgid " Check File "
 msgstr " ������ ������ "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "������"
 
@@ -2068,7 +2068,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2133,7 +2133,7 @@ msgstr ""
 msgid "Maximum Entries"
 msgstr ""
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "蠍磯蓋"
 
@@ -2190,7 +2190,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "螻�襯願鍵..."
 
@@ -2346,12 +2346,12 @@ msgstr "�启�� ���覲企ゼ ��れ�����������...\n"
 msgid "Setting folder info..."
 msgstr "�启�� ���覲企ゼ ��れ�����������..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s襯� ��れ�����������..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s �启��襯� ��れ�����������..."
@@ -2625,7 +2625,7 @@ msgstr "LDIF �����殊�� 譯殊��襦���朱�� 螳���語�り鍵"
 msgid "Prev"
 msgstr "��伎��"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "��れ��"
 
@@ -2646,199 +2646,199 @@ msgstr ""
 msgid "Sylpheed: %d new messages"
 msgstr "��������給����� (%d螳���� ���襦���� 覃����讌�)"
 
-#: src/inc.c:388
+#: src/inc.c:433
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "��語��"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "��� 覃����讌�襯� 螳���語��"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr ""
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "豬������������給�����"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr ""
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "���襭� (%d 覃����讌� (%s)螳� 覦����讌�)"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "���襭� (��� 覃����讌� ������)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "��郁屋��� ��ろ�������給�����"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "��語����� ��ろ�������給�����."
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:637
+#: src/inc.c:682
 msgid "Timeout"
 msgstr ""
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "��������給����� (%d螳���� ���襦���� 覃����讌�)"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "��������給����� (��� 覃����讌� ������)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "�ｸ讌�襯� 覦���り�� ������螳� 覦���������給�����."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s 螻������朱��覿���� ��� 覃����讌�襯� ��詞�給�����...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "��語��"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: ��� 覃����讌�襯� 螳���語��"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3 ���覯� %s��� ��郁屋���������..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "%s:%d POP3 ���覯���� ��郁屋��� ���螳� �����給�����\n"
 
-#: src/inc.c:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "��語�� 譴����������..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s襦�覿���� %s襦� 覃����讌�襯� 螳���語�給�����...\n"
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "��� 覃����讌���� 螳����襯� ��視�� 譴� (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "��� 覃����讌���� 螳����襯� ��視�� 譴� (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "��� 覃����讌���� 螳����襯� ��視�� 譴� (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "覃����讌���� ���蠍磯ゼ ��視�� 譴� (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d 覃����讌�襯� ������������ 譴�"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "���襷�豺���� 譴�"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "覃����讌� (%d / %d) 襯� 螳���語�る�� 譴� (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "���襭� (%d 覃����讌� (%s)螳� 覦����讌�)"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 #, fuzzy
 msgid "Connection failed."
 msgstr "��郁屋��� ��ろ�������給�����"
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "覃���殊�� 豌�襴������� ���譴� ������"
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "覃���殊�� 豌�襴������� ���譴� ������"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "�����ろ����� ������ 螻糾����� ������."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "�����殊�� ��� ���螳� �����給�����."
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "���貅� ������."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "覃���朱����り�� ���蟆������給�����."
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "覃���朱����り�� ���蟆������給�����."
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 #, fuzzy
 msgid "Authentication failed."
 msgstr "��語�� 覦�覯�"
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "��語�� 覦�覯�"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "覲������� 豬������������給�����.\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s襦�覿���� %s襦� ��� 覃����讌�襯� 螳���語��...\n"
@@ -3748,7 +3748,7 @@ msgstr "覈���� 螻���������� ��� 覃���殊�� 螳���語�給�����"
 msgid "Send queued message(s)"
 msgstr "������ 覲願����� 覃����讌�襯� 覲企��������"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "������"
@@ -3790,62 +3790,62 @@ msgstr "覃����讌�襯� 讌����������"
 msgid "Set as junk mail"
 msgstr "蠍磯蓋 螻������朱�� ��れ��"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "��ろ��"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "��������� ���襦���語�る�れ�� ��ろ�����������"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "��れ�� ��� ��曙�� 覃����讌�襯� 覲伎��譴�������"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "��れ��"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "蠍磯蓋������ ���蟆� ��れ��"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "螻����"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "螻������� ��れ�����������"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "�����願鍵"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "��� ���襦�蠏碁����� �����伎��蟆���給��蟾�?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 #, fuzzy
 msgid "Command line options"
 msgstr "覈���轟�� 讌�������讌�������"
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "������覯�: %s [��旧��]...\n"
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3861,7 +3861,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4070,426 +4070,431 @@ msgstr ""
 "Bad passphrase! ��れ�� �����������語��...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "螻���� ��れ�� 谿曙�� ��暑�����...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "螻����%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "��� 螻������������� ��れ��"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "螻���� 蠍磯蓋 ��れ��"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "螻���� ��れ�� 谿曙�� �����燕��������...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "覦�蠍�"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "�����殊�企�����"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "螻�蠍�"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "��� 螻������� ��企��"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "蠍磯蓋 螻������朱�� ��れ��"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "������ ���覲�"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "������ ��企��"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "覃���� 譯殊��"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "蠍郁��"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "���覯� ���覲�"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "��伎��(NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "襦�貉�"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "��� ���覯���� ��語����� ������襦� ���������"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "��伎�� ���覯�"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "覦���� ���覯�"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "SMTP ���覯�(覦���′��)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "��������� 螻����"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "������"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "��� ���覯���� ��語����� ������襦� ���������"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "覦���� ��� ���覯������� 覃����讌�襯� 讌����"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 #, fuzzy
 msgid "Remove after"
 msgstr "�启�� ��企�� 覲�蟆�"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 #, fuzzy
 msgid "days"
 msgstr "������"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 ���: 讀���� ������)"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "���覯������� 覈���� 覃����讌�襯� 覦����"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "覦���� ���蠍� ������"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "覦������� 覃����讌�襯� �����磯��"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "蠍磯蓋 ��壱ｸ���"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(�����磯�� ���讌� ������ 覃����讌���� ��� �启����� �����ル�� 蟆����������)"
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "��語�� 覦�覯�"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "������"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "覦������� 覃����讌�襯� �����磯��"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "��伎��"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "��企�る����� 豕���� 蠍一�� ���\n"
 "(0��� 蟆曙�� ������ ������)"
 
-#: src/prefs_account_dialog.c:1024
+#: src/prefs_account_dialog.c:1030
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "覦���� ��������� 讌�������讌���������給�����"
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 msgid "`Get all' checks for new messages on this account"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "��る��"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "Date ��る�� ���覈���� 豢�螳�"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "Message-ID ������"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "��������� ��������� ��る�� 豢�螳�"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " �ｸ讌�..."
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "��語��"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP ��語��(SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "覲企�願鍵��� POP3��� ��語��"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 #, fuzzy
 msgid "Command output"
 msgstr "覈���轟��"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "��れ�� 譯殊��襯� �����������朱�� ������"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "谿語＾"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "������ 谿語＾"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "������譯殊��"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "蠍磯蓋��朱�� 覃����讌���� �����語�� ���"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "蠍磯蓋��朱�� 覃����讌�襯� �����誤��"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "��������� �����ろ�� ���覈� ������"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "蠍磯蓋 GnuPG ��� ������"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "��轟����� ��������壱ｸ 譯殊��襦� ��� ������"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "��������朱�� ��� 讌����"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "��������� ��轟�� ��� ID:"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "SSL��� ���������讌� �����給�����"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "POP3 ��郁屋��� SSL��� ���������������"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "SSL ��語����� ���������蠍� ������ STARTTLS 覈���轟�� ���������������"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "IMAP4 ��郁屋��� SSL��� ���������������"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "NNTP ��郁屋��� SSL��� ���������������"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "SMTP ��郁屋��� SSL��� ���������������"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "SMTP ������ 覯����"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "POP3 ������ 覯����"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "IMAP4 ������ 讌����"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "NNTP ������ 讌����"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "���覃���� ��企�� 讌����"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "IMAP ���覯� ���������襴�"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "���覯������� 覈���� 覃����讌�襯� 覦����"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "覲企�� 覃����讌� ������"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "������ 覃����讌� ������"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "��������� 覃����讌� ������"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "��������� 覃����讌� ������"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "螻���� ��企����� �����ル��讌� ��������給�����."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "覃���� 譯殊��螳� 讌�������讌���������給�����."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "SMTP ���覯�螳� 讌�������讌���������給�����."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "��������� �����企��螳� 讌�������讌���������給�����."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "POP3 ���覯�螳� 讌�������讌���������給�����."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 ���覯�螳� 讌�������讌���������給�����."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "NNTP ���覯�螳� 讌�������讌���������給�����."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6769,36 +6774,36 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/��� ��企����朱��(_S)..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "��� 覃����讌�襯� �����燕��������"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/譯殊��襦���� 覲企�語�� 豢�螳�(_k)"
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "螻旧�� 譯殊��襦�"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "��� ������蠍�"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6807,7 +6812,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/lt.po b/po/lt.po
index 3924d277..84793379 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2005-06-09 13:51+0300\n"
 "Last-Translator: Vitalijus Valantiejus <vitalijus@users.sf.net>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -18,194 +18,194 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Skaitoma kiekvienos s��skaitos konfig笛racija...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 prisijungimas prie %s buvo nutrauktas. Jungiamasi...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP4 serveris panaikina LOGIN.\n"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "sukuriamas IMAP4 prisijungimas prie %s:%d ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "Negaliu sukurti TLS sesijos.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, c-format
 msgid "Getting message %d"
 msgstr "Gaunamas lai邸kas %d"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Pridedami lai邸kai 眺 %s (%d / %d)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Perkeliami lai邸kai %s 眺 %s ..."
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopijuojami lai邸kai %s 眺 %s ..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "��alinami lai邸kai %s..."
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "negaliu nustatyti i邸trynimo 転ym迭: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "negaliu i邸braukti\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Trinami lai邸kai i邸 %s..."
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "negaliu nustatyti i邸trynimo 転ym迭: 1:*\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "negaliu u転daryti katalogo\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "邸akninis katalogas %s neegzistuoja\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "klaida gaunant LIST.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Negaliu sukurti ���%s���\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "negaliu sukurti ���%s��� po INBOX\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "negaliu sukurti d��転ut��s: nepavyko LIST\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "negaliu sukurti d��転ut��s\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "negaliu pervadinti d��転ut��s: %s 眺 %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "negaliu i邸trinti d��転ut��s\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "nagaliu gauti voko\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Gaunamos lai邸k迭 antra邸t��s (%d / %d)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "klaida gaunant vok��.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "negaliu i邸analizuoti voko: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Negaliu prisijungti prie IMAP4 serverio: %s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Negaliu sukurti IMAP4 sesijos su: %s:%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "negali迭 gauti vard迭 zonos\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "negaliu pasirinkti katalogo: %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 msgid "error on imap command: STATUS\n"
 msgstr "klaida vykdant imap komand��: STATUS\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 autenti邸kumo tikrinimas nepavyko.\n"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "nepavyko prisijungti prie IMAP4\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "negaliu prira邸yti %s 眺 %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(siun��iamas failas...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "negaliu prid��ti lai邸ko 眺 %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "negaliu nukopijuoti %s 眺 %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "klaida vykdant imap komand��: STORE %s %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "klaida vykdant imap komand��: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 msgid "error while imap command: CLOSE\n"
 msgstr "klaida vykdant imap komand��: CLOSE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv negali konvertuoti UTF-7 眺 %s\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv negali konvertuoti %s 眺 UTF-7\n"
@@ -292,25 +292,25 @@ msgstr "negaliu suma転inti d��転ut��s iki nulio.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Eksportuojami lai邸kai i邸 %s 眺 %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "negaliu nukopijuoti lai邸ko %s 眺 %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "Negaliu atidaryti 転ym迭 failo.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "pradinis katalogas identi邸kas paskirties katalogui.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopijuoju lai邸k�� %s%c%d 眺 %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -319,7 +319,7 @@ msgstr ""
 "Failas ���%s��� jau egzistuoja.\n"
 "Negaliu sukurti katalogo."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -338,77 +338,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "sukuriu NNTP prisijungim�� prie %s:%d ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP prisijungimas prie %s:%d buvo nutrauktas. Jungiuosi i邸 naujo...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "転inut�� %d jau buvo 眺kelta.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "gaunama 転inut�� %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "negaliu perskaityti 転inut��s %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "negaliu paskelbti 転inut��s.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "negaliu gauti 転inut��s %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "negaliu pa転ym��ti grup��s: %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neteisingas 転inu��i迭 intervalas: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "n��ra nauj迭 転inu��i迭.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "gaunamas xover %d - %d, %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "negaliu gauti xover\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "klaida gaunant xover.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "bloga xover eilut��: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "negaliu gauti xhdr\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "klaida gaunant xhdr.\n"
 
@@ -486,7 +486,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "klaida POP3 sesijoje\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "nepavyko 眺ra邸yti konfig笛racijos 眺 fail��\n"
@@ -517,12 +517,12 @@ msgstr "procmime_get_text_content(): Nepavyko konvertuoti kodo.\n"
 msgid "can't open mark file\n"
 msgstr "negali atidaryti 転ym迭 failo\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "negaliu gauti lai邸ko %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Bloga spausdinimo komanda: ���%s���\n"
@@ -691,7 +691,7 @@ msgstr ""
 msgid "Name"
 msgstr "Vardas"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "Protokolas"
 
@@ -1151,7 +1151,7 @@ msgid "Group"
 msgstr "Grup��"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Katalogas"
@@ -1184,7 +1184,7 @@ msgstr "Prane邸imas"
 msgid "Warning"
 msgstr "町sp��jimas"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "Klaida"
 
@@ -1703,7 +1703,7 @@ msgstr "MIME tipas"
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "Si迭sti"
@@ -1745,7 +1745,7 @@ msgid "Attach file"
 msgstr "Prisegti fail��"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "Para邸as"
@@ -1952,7 +1952,7 @@ msgid " Check File "
 msgstr " Patikrinti fail�� "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "Failas"
 
@@ -2030,7 +2030,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2095,7 +2095,7 @@ msgstr "Skirtasis laikas (sek.)"
 msgid "Maximum Entries"
 msgstr "町ra邸迭 maksimumas"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "Pagrindinis"
 
@@ -2152,7 +2152,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Pasirinkti... "
 
@@ -2302,12 +2302,12 @@ msgstr "Nustatoma katalogo informacija...\n"
 msgid "Setting folder info..."
 msgstr "Nustatoma katalogo informacija..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Skanuojamas katalogas ���%s%c%s���..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Skanuojamas katalogas ���%s���..."
@@ -2580,7 +2580,7 @@ msgstr "Importuoti LDIF fail�� 眺 adres迭 knyg��"
 msgid "Prev"
 msgstr "Atgal"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "Kitas"
 
@@ -2601,143 +2601,143 @@ msgstr "Baigti"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nauji lai邸kai"
 
-#: src/inc.c:388
+#: src/inc.c:433
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Tikrinamas autenti邸kumas"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "Gaunami nauji lai邸kai"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "Laukiama"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "Nutraukta"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "Gaunama"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Atlikta (gauta lai邸k迭: %d (%s))"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "Atlikta (nauj迭 lai邸k迭 negauta)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "Nepavyko prisijungti"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "Nepavyko patvirtinti autenti邸kumo"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "U転rakinta"
 
-#: src/inc.c:637
+#: src/inc.c:682
 msgid "Timeout"
 msgstr "Baig��si skirtasis laikas"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Baigta (Nauji lai邸kai: %d)"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "Baigta (N��ra nauj迭 lai邸k迭: %d)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "Klaidos gaunant pa邸t��."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "gaunami ���%s��� s��skaitos lai邸kai...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Tikrinamas autenti邸kumas"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: gaunami nauji lai邸kai"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Jungiuosi prie POP3 serverio: %s..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Negaliu prisijungti prie POP3 serverio: %s:%d\n"
 
-#: src/inc.c:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Patvirtinamas autenti邸kumas..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Gaunami lai邸kai i邸 %s..."
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Gaunamas nauj迭 lai邸k迭 skai��ius (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Gaunamas nauj迭 lai邸k迭 skai��ius (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Gaunamas nauj迭 lai邸k迭 skai��ius (UILD)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "Gaunamas nauj迭 lai邸k迭 dydis (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "Trinamas lai邸kas %d"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "I邸einu"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Gaunamas lai邸kas (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Gaunama (Gauti lai邸kai: %d (%s))"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 msgid "Connection failed."
 msgstr "Nepavyko prisijungti."
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "Klaida tvarkant pa邸t��."
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2746,28 +2746,28 @@ msgstr ""
 "Klaida tvarkant pa邸t��:\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "N��ra vietos diske."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "Negaliu 眺ra邸yti 眺 fail��."
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "Socket error."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr "Prisijungimas u転darytas nuotolinio serverio."
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "D��転ut�� u転rakinta."
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2776,11 +2776,11 @@ msgstr ""
 "D��転ut�� u転rakinta:\n"
 "%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 msgid "Authentication failed."
 msgstr "Nepavyko patvirtinti autenti邸kumo."
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2789,15 +2789,15 @@ msgstr ""
 "Nepavyko patvirtinti autenti邸kumo:\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr "Baig��si sesijos laikas."
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "Prijungimas nutrauktas\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Gaunami nauji lai邸kai i邸 %s 眺 %s...\n"
@@ -3675,7 +3675,7 @@ msgstr "Prijungti nauj�� vis迭 s��skait迭 pa邸t��"
 msgid "Send queued message(s)"
 msgstr "Si迭sti lai邸kus eil��je"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Ra邸yti"
@@ -3716,60 +3716,60 @@ msgstr "I邸trinti lai邸k��"
 msgid "Set as junk mail"
 msgstr "Pa転ym��ti kaip nereikaling��"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "Vykdyti"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "Vykdyti pa転ym��tus procesus"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "Kitas neskaitytas lai邸kas"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "Nustatymai"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "Bendri nustatymai"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "S��skaita"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "S��skaitos nustatymai"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr "J笛s esate atsijung��s. Spustelkite piktogram�� jei norite prisijungti."
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr "J笛s esate prisijung��s. Spustelkite piktogram�� jei norite atsijungti."
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "I邸eiti"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "U転verti program��?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 msgid "Command line options"
 msgstr "Komandin��s eilut��s parametrai"
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Naudojimas: sylpheed [PARAMETRAI]..."
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3797,7 +3797,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4017,218 +4017,223 @@ msgstr ""
 "Bloga slapta fraz��! Bandykite dar kart��...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "Atveriamas s��skaitos nustatym迭 langas...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "S��skaita%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "Naujos s��skaitos nustatymai"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "S��skaitos nustatymai"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "Sukuriamas s��skaitos nustatym迭 langas...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "Gauti"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "Privatumas"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "Papildomi"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "S��skaitos vardas"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "Pa転ym��ti kaip 眺prast��"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "Asmenin�� informacija"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "Pilnas vardas"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "El. pa邸to adresas"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "Organizacija"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "Severio informacija"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "Naujienos (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "Vietinis"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "Serveris reikalauja patvirtinti autenti邸kum��"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "Naujien迭 serveris"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "Serveris pa邸to gavimui"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "SMTP serveris (siuntimui)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "Vartotojo ID"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "Slapta転odis"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 msgid "Use secure authentication (APOP)"
 msgstr "Naudoti saug迭 autenti邸kumo tikrinim�� (APOP)"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "Po gavimo pa邸alinti lai邸kus i邸 serverio"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "Pa邸alinti po"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "dien迭"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 msgid "0 days: remove immediately"
 msgstr "0 dien迭: pa邸alinti i邸 karto"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Atsisi迭sti visus lai邸kus serveryje"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "Dyd転io limitas"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "Filtruoti lai邸kus gaunant"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "Gaunam迭 lai邸k迭 d��転ut��"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Nefiltruoti lai邸kai bus laikomos 邸iame kataloge."
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "Autenti邸kumo patikrinimo metodas"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "Automatinis"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
 msgstr "Tikrinti tik INBOX"
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "Filtruoti lai邸kus gaunant"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "Naujienos"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 msgid "Maximum number of articles to download"
 msgstr "Maksimalus parsiun��iam迭 lai邸k迭 skai��ius"
 
-#: src/prefs_account_dialog.c:1024
+#: src/prefs_account_dialog.c:1030
 msgid "No limit if 0 is specified."
 msgstr "Nelimituojama, jei nurodyta ���0���."
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 msgid "`Get all' checks for new messages on this account"
 msgstr "���Gauti visus��� tinkrina pa邸t�� 邸ioje s��skaitoje"
 
-#: src/prefs_account_dialog.c:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Antra邸t��"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "Prid��ti ���Date��� antra邸t��s lauk��"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "Generuoti ���Message-ID���"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "Prid��ti vartotojo nustatytas antra邸tes"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " Redaguoti... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "Autenti邸kumo patikrinimas"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP autenti邸kumo patikrinimas (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4236,197 +4241,197 @@ msgstr ""
 "Jei paliksite 邸iuos laukus tu邸��ius, bus naudojamas tas pats vartotojo ID ir "
 "slapta転odis kaip ir gaunant."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "Prie邸 siun��iant patikrinti autenti邸kum�� su POP3"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 msgid "Command output"
 msgstr "Komandos i邸vestis"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Automati邸kai nustatyti sekan��ius adresus"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "Pasira邸yti lai邸kus"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "Koduoti lai邸kus"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr "Koduoti kai atsakoma 眺 koduot�� lai邸k��"
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "Naudoti ���ASCII-armored��� format�� kodavimui"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "Naudoti ���clear text��� para邸��"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "Para邸o raktas"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "Naudoti numatyt��j眺 GnuPG rakt��"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "Parinkti rakt�� pagal j笛s迭 el. pa邸to adres��"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "Nurodyti rakt��"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "Vartotojo arba rakto ID"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "Nenaudoti SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "Naudoti SSL POP3 prisijungimui"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Naudoti STARTTLS komand�� SSL sesijos prad転iai"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "Naudoti SSL IMAP4 prisijungimui"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "Naudoti SSL NNTP prisijungimui"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "Siuntimas (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "Naudoti SSL SMTP prisijungimui"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr "Naudoti ���non-blocking SSL���"
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 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:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "Nurodykite SMTP prievad��"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "Nurodykite POP3 prievad��"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "Nurodykite IMAP4 prievad��"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "Nurodykite NNTP prievad��"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "Nurodykite domeno vard��"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "IMAP serverio katalogas"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Bus rodomi tik 邸io katalogo pakatalogiai."
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 msgid "Clear all message caches on exit"
 msgstr "I邸valyti lai邸k迭 laikinas kopijas (cache) i邸einant"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "Si迭stus lai邸kus d��ti 眺"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "Juodra邸��ius d��ti 眺"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 msgid "Put queued messages in"
 msgstr "Lai邸k迭 eil�� d��ti 眺"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "I邸trintus lai邸kus d��ti 眺"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "Ne眺vestas s��skaitos pavadinimas."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "Ne眺vestas pa邸to adresas."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "Ne眺vestas SMTP serveris."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "Ne眺vestas vartotojo ID."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "Ne眺vestas POP3 serveris."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "Ne眺vestas IMAP4 serveris."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "Ne眺vestas NNTP serveris."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr "Nurodytas ne eil��s katalogas."
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6652,31 +6657,31 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 msgid "Sa_ve this image as..."
 msgstr "Saugoti pa_veiksl��l眺 kaip"
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Ra邸yti _nauj�� lai邸k��"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 msgid "Add to address _book..."
 msgstr "Prid��ti 眺 adres迭 _knyg��"
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 msgid "Copy this add_ress"
 msgstr "Kopijuoti ad_res��"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 msgid "_Open with Web browser"
 msgstr "_Atverti su nar邸ykle"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr "Kopijuoti _nuorod��"
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6689,7 +6694,7 @@ msgstr ""
 "\n"
 "Visvien atverti?"
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr "Persp��jimas d��l netikro URL"
 
diff --git a/po/nl.po b/po/nl.po
index b73f2f86..cb04b2f1 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2006-04-30 01:11+0100\n"
 "Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -18,197 +18,197 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Configuratie inlezen van alle accounts...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 "IMAP4 verbinding naar %s is verbroken. Contact wordt opnieuw gelegd...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP4 server schakelt LOGIN uit.\n"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "IMAP4 verbinding naar %s:%d wordt opgezet...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "Kan geen TLS sessie starten.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, c-format
 msgid "Getting message %d"
 msgstr "Ophalen van bericht %d"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Berichten toevoegen aan %s (%d / %d)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Berichten %s worden verplaatst naar %s ..."
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Berichten %s worden gekopieerd naar %s..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "Berichten %s worden verwijderd"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kan verwijderd-vlaggen niet instellen: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "kan niet wissen\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Alle berichten in %s worden verwijderd"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kan de verwijderd-vlaggen niet instellen: 1:*\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "kan map niet sluiten\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "De beginmap %s bestaat niet\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "er is een fout opgetreden bij het ophalen van de lijst.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr ""
 "kan %s niet aanmaken\n"
 "\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "kan %s niet aanmaken onder INBOX\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan geen mailbox maken: LIST mislukt\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "kan geen mailbox maken\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan de mailbox niet hernoemen van %s naar %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "kan de mailbox niet verwijderen\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "kan de envelop niet verkrijgen\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Ophalen van berichtkoppen (%d / %d)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "Er is een fout opgetreden bij het verkrijgen van de envelop.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kan de envelop niet verwerken: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Kan niet verbinden met de IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Kan gaan sessie opzetten met de IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "kan de NAMESPACE niet vinden\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan map niet selecteren: %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 msgid "error on imap command: STATUS\n"
 msgstr "Fout bij IMAP-opdracht: STATUS\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4-identificatie mislukt.\n"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login mislukt.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan %s niet toevoegen aan %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(bestand wordt verzonden...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kan bericht niet toevoegen aan %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan %s niet naar %s kopi谷ren\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Fout bij IMAP-opdracht: STORE %s %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Fout tijdens IMAP opdracht: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 msgid "error while imap command: CLOSE\n"
 msgstr "Fout bij IMAP-opdracht: CLOSE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan UTF-7 niet naar %s omzetten\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan %s niet naar UTF-7 omzetten\n"
@@ -295,25 +295,25 @@ msgstr "kan de mailbox niet inkorten tot 0.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Berichten worden ge谷xporteerd van %s naar %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "kan bericht niet kopi谷ren van %s naar %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "kan het bestand met markeringen niet openen\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "de bronmap is hetzelfde als de doelmap.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Bericht %s%c%d wordt gekopieerd naar %s...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -322,7 +322,7 @@ msgstr ""
 "Bestand '%s' bestaat al.\n"
 "Kan geen map aanmaken."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -341,79 +341,79 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "verbinding met nieuwsserver (NNTP) %s%d wordt opgezet...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr ""
 "De NNTP-verbinding met %s:%d is verbroken. Opnieuw contact aan het "
 "leggen...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "artikel %d is al gebufferd.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "artikel %d wordt opgehaald...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "kan artikel %d niet lezen\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "kan het ertikel niet versturen.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "kan het artikel %d niet ophalen\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "kan de groep niet selecteren: %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ongeldig artikelbereik: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "geen nieuwe artikelen.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "xover %d - %d uit %s wordt opgehaald...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "Kan xover niet ophalen\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "er is een fout opgetreden tijdens het ophalen van de xover.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "Ongeldige xover regel: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "Kan xhdr niet ophalen\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "er is een fout opgetreden tijdens het ophalen van de xhdr.\n"
 
@@ -491,7 +491,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "er is een fout opgetreden tijdens de POP3-sessie\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "opslaan van de configuratie is mislukt\n"
@@ -522,12 +522,12 @@ msgstr "procmime_get_text_content(): Codeconversie mislukt\n"
 msgid "can't open mark file\n"
 msgstr "kan het bestand met markeringen niet openen\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kan bericht %d niet ophalen\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Adrukopdracht is ongeldig: '%s'\n"
@@ -699,7 +699,7 @@ msgstr ""
 msgid "Name"
 msgstr "Naam"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "Protocol"
 
@@ -1162,7 +1162,7 @@ msgid "Group"
 msgstr "Groep"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Accounts"
@@ -1195,7 +1195,7 @@ msgstr "Bericht"
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "Fout"
 
@@ -1714,7 +1714,7 @@ msgstr "MIME-type"
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "Verzenden"
@@ -1756,7 +1756,7 @@ msgid "Attach file"
 msgstr "Bestand bijvoegen"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "Tekenen"
@@ -1963,7 +1963,7 @@ msgid " Check File "
 msgstr " Controleer bestand"
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "Bestand"
 
@@ -2042,7 +2042,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr "Bladeren..."
@@ -2107,7 +2107,7 @@ msgstr "Timeout (sec)"
 msgid "Maximum Entries"
 msgstr "Maximum aantal velden"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "Algemeen"
 
@@ -2165,7 +2165,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "Selecteer..."
 
@@ -2316,12 +2316,12 @@ msgstr "Mapinfo wordt ingesteld...\n"
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
@@ -2595,7 +2595,7 @@ msgstr "Importeer LDIF bestand in het adresboek"
 msgid "Prev"
 msgstr "Vorig"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "Volgende"
 
@@ -2616,143 +2616,143 @@ msgstr "Afronden"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nieuwe berichten"
 
-#: src/inc.c:388
+#: src/inc.c:433
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Bezig met identificatie"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "Een ogenblik geduld alstublieft"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "Afgebroken"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "Bezig met ophalen"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Klaar (%d bericht(en) (%s) ontvangen)"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "Klaar (geen nieuwe bercihten)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "Identificatie mislukt"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "Vergrendeld"
 
-#: src/inc.c:637
+#: src/inc.c:682
 msgid "Timeout"
 msgstr "Time-out"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Klaar (%d nieuwe bericht(en))"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "Klaar (geen nieuwe berichten)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "Er is een fout opgetreden bij het ophalen van de e-mail."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "nieuwe berichten voor account %s worden opgehaald...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Bezig met identificatie"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Verbinden met POP3-server: %s ..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, 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:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Bezig met identificatie..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Berichten ophalen van %s..."
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Opvragen van het aantal nieuwe berichten (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Opvragen van het aantal nieuwe berichten (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "Opvragen van de grootte van de nieuwe berichten (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "Bezig met verwijderen van bericht %d"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "Bezig met afsluiten"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Bericht wordt opgehaald (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ophalen (%d bericht(en) (%s) ontvangen)"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 msgid "Connection failed."
 msgstr "Verbinding mislukt."
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "Fout bij het verwerken van de e-mail"
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2761,29 +2761,29 @@ msgstr ""
 "Fout bij het verwerken van de e-mail:\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "De ruimte op de schijf is op."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "Het bestand is niet beschrijfbaar."
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "Socket-fout."
 
 #  consider EOF right after QUIT successful
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr "Verbinding verbroken door verbindingspartner."
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "Mailbox is vergrendeld."
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2792,11 +2792,11 @@ msgstr ""
 "Mailbox is vergrendeld:\n"
 "%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 msgid "Authentication failed."
 msgstr "Identificatie mislukt."
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2805,15 +2805,15 @@ msgstr ""
 "Identificatie mislukt:\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr "Sessie is verlopen."
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "E-mail verwerken geannuleerd\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Nieuwe berichten worden opgehaald van %s naar %s ...\n"
@@ -3695,7 +3695,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:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Opstellen"
@@ -3736,64 +3736,64 @@ msgstr "Verwijder dit bericht"
 msgid "Set as junk mail"
 msgstr "Dit is troep"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "Voer de gemarkeerde acties uit"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "Volgende ongelezen"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "Voork."
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "Algemene voorkeuren"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "Accountinstellingen"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "U bent off-line aan het werken. Klik op het pictogram om on-line te gaan "
 "werken."
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 "U bent on-line aan het werken. Klik op het pictogram om off-line te gaan "
 "werken."
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "Sylpheed afsluiten?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 msgid "Command line options"
 msgstr "Opties voor de opdrachtregel"
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Gebruik: Sylpheed [OPTIES]..."
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3821,7 +3821,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4040,218 +4040,223 @@ msgid ""
 "\n"
 msgstr "Slecht wachtwoord! Probeer opnieuw...\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "Venster accountvoorkeuren wordt geopend...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "Voorkeuren voor nieuw account"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Accountvoorkeuren"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "Venster accountvoorkeuren wordt geopend...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "Ontvangen"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "Naam van dit account"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "Instellen als standaard"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "Persoonlijke informatie"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "Volledige naam"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "E-mail adres"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "Organisatie"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "Serverinformatie"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "Nieuws (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "Niets (lokaal)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "Deze server vereist authentificatie"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "Nieuwsserver"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "Server om van te ontvangen"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "SMTP server (om te verzenden)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "Gebruikersnaam"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 msgid "Use secure authentication (APOP)"
 msgstr "Veilige identificatie gebruiken (APOP)"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "Verwijder berichten op de server wanneer ze worden opgehaald"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "Verwijderen na"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "dagen"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 msgid "0 days: remove immediately"
 msgstr "0 dagen: direct verwijderen"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Haal alle berichten op van server"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "Limiet ontvangstgrootte"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "Filter de berichten bij het ophalen"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "Standaard inbox"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Ongefilterde berichten zullen hier opgeslagen worden"
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "Identificatiemethode"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
 msgstr "Alleen de INBOX op nieuwe e-mail controleren"
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "Filter de berichten bij het ophalen"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "Nieuws"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 msgid "Maximum number of articles to download"
 msgstr "Maximum aantal te downloaden artikelen"
 
-#: src/prefs_account_dialog.c:1024
+#: src/prefs_account_dialog.c:1030
 msgid "No limit if 0 is specified."
 msgstr "Geen limiet als 0 is ingesteld."
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 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:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Header"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "Datum veld toevoegen aan header"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "Bericht-ID aanmaken"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "Voeg een door de gebruiker gespecificeerde header toe"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr "Bewerken"
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "Identificatie"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP identificatie (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4259,197 +4264,197 @@ msgstr ""
 "Als u deze ingangen niet invult, zal hetzelfde naam/wachtwoord-paar gebruikt "
 "worden als voor het ontvangen."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "Identificatie met POP3 voor het verzenden"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 msgid "Command output"
 msgstr "Resultaat van opdracht"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Stel automatisch de volgende adressen in"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "Antwoorden naar"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "Standaard een identificatiehandtekening toevoegen"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "Standaard het bericht coderen"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr "Versleutelen indien reactie op versleuteld bericht"
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "ASCII-versterkt formaat gebruiken voor codering"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "Teksthandtekening gebruiken"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "Signeersleutel"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "Gebruik standaard GnuPG sleutel"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "Selecteer sleutel naar e-mail adres"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "Specificeer sleutel zelf"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "Gebruikers- of sleutel-ID:"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "Geen SSL gebruiken"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "SSL gebruiken voor POP3 verbinding"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Het STARTTLS commando gebruiken om een SSL sessie te starten"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL gebruiken voor IMAP verbinding"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "SSL gebruiken voor NNTP verbinding"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "Verzenden (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "SSL gebruiken voor SMTP verbinding"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr "Niet-blokkerende SSL gebruiken"
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 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:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "SMTP poort"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "POP3 poort"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "IMAP4 poort"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "SMTP poort"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "Specificeer domeinnaam"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "IMAP server-map"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 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:1760
+#: src/prefs_account_dialog.c:1767
 msgid "Clear all message caches on exit"
 msgstr "Alle buffers legen bij afsluiten"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "Verzonden berichten opslaan in"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "Kladberichten opslaan in"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 msgid "Put queued messages in"
 msgstr "Wachtrijberichten opslaan in"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "Verwijderde berichten opslaan in"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "Accountnaam is niet ingevuld."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "E-mail adres is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "SMTP server is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "Gebruikersnaam is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "POP3 server is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 server is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "NNTP server is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr "Aangegeven map kan niet gebruikt worden als wachtrij."
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6689,31 +6694,31 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 msgid "Sa_ve this image as..."
 msgstr "Afbeelding opslaan _als..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "_Nieuw bericht opstellen"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 msgid "Add to address _book..."
 msgstr "Toevoegen aan _adresboek"
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 msgid "Copy this add_ress"
 msgstr "_Adres kopi谷ren"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 msgid "_Open with Web browser"
 msgstr "Openen met webbrowser"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr "_Link kopi谷ren"
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6726,7 +6731,7 @@ msgstr ""
 "\n"
 "Wilt u het toch openen?"
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr "Waarschuwing! Misleidende link"
 
diff --git a/po/pl.po b/po/pl.po
index 917c5890..9ab90540 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2005-03-05 18:57+0100\n"
 "Last-Translator: Wit Wilinski <madman at linux dot bydg dot org>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -15,197 +15,197 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Odczyt ustawie�� wszystkich kont...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 "Po����czenie IMAP4 z %s zosta��o przerwane. Ponowne nawi��zywanie po����czenia...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Katalog serwera IMAP4."
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "tworzenie po����czenia IMAP4 do %s:%d ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "Nie mo甜na uruchomi�� sesji TLS\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Usuwanie wiadomo��ci %d"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Wysy��anie wiadomo��ci (%d / %d)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Kopiowanie wiadomo��ci %s%c%d do %s ...\n"
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiowanie wiadomo��ci %s%c%d do %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Pobieranie wiadomo��ci z %s..."
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nie mo甜na ustawi�� flag skasowany: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "nie mo甜na zlikwidowa��\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Pobieranie wiadomo��ci z %s..."
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nie mo甜na ustawi�� flagi skasowany: 1:*\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "nie mo甜na zamkn���� katalogu\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "brak g��坦wnego katalogu %s\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "wyst��pi�� b����d podczas przy pobieraniu LIST.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "nie mo甜na utworzy�� \"%s\"\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "nie mo甜na utworzy�� \"%s\" w INBOX\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nie mo甜na utworzy�� skrzynki: b����d LIST.\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "nie mo甜na utworzy�� skrzynki\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nie mo甜na zmieni�� nazwy skrzynki: %s na %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "nie mo甜na skasowa�� skrzynki\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "nie mo甜na pobra�� koperty\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Wysy��anie wiadomo��ci (%d / %d)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "wyst��pi�� b����d podczas pobierania koperty.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "nie mo甜na przetworzy�� koperty: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nie mo甜na nawi��za�� po����czenia z serwerem IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nie mo甜na ustanowi�� sesji IMAP4 z: %s:%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "nie mo甜na pobra�� przestrzeni nazw\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nie mo甜na wybra�� katalogu: %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "wyst��pi�� b����d przy wykonywaniu polecenia IMAP: CLOSE\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 msgid "IMAP4 authentication failed.\n"
 msgstr "B����d uwierzytelniania IMAP4.\n"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "Nie mo甜na zalogowa�� si�� do serwera IMAP4.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nie mo甜na do����czy�� %s do %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(wysy��anie pliku...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nie mo甜na do����czy�� wiadomo��ci do %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nie mo甜na skopiowa�� %s do %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "wyst��pi�� b����d przy wykonywaniu polecenia IMAP: STORE %s %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "wyst��pi�� b����d przy wykonywaniu polecenia IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 msgid "error while imap command: CLOSE\n"
 msgstr "wyst��pi�� b����d przy wykonywaniu polecenia IMAP: CLOSE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "nie mo甜na skonwertowa�� UTF-7 do %s za pomoc�� programu iconv\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "nie mo甜na skonwertowa�� %s do UTF-7 za pomoc�� programu iconv\n"
@@ -292,25 +292,25 @@ msgstr "nie mo甜na skr坦ci�� do zera.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Eksportowanie wiadomo��ci z %s do %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "nie mo甜na skopiowa�� wiadomo��ci %s do %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "Nie mo甜na otworzy�� pliku zaznacze��.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "katalog 添r坦d��owy jest taki sam jak docelowy.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopiowanie wiadomo��ci %s%c%d do %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -319,7 +319,7 @@ msgstr ""
 "Plik \"%s\" ju甜 istnieje.\n"
 "Nie mo甜na utworzy�� katalogu."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -331,78 +331,78 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "tworzenie po����czenia NNTP z %s:%d ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr ""
 "Po����czenie NNTP %s:%d zosta��o zerwane. Ponowne nawi��zywanie po����czenia...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "artyku�� %d zosta�� ju甜 zapami��tany.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "pobieranie artyku��u %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "nie mo甜na odczyta�� artyku��u %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "nie mo甜na wys��a�� artyku��u.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "nie mo甜na odebra�� artyku��u %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "nie mo甜na wybra�� grupy: %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "niepoprawny zakres artyku��u: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "brak nowych artyku��坦w.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "pobieranie xover %d - %d w %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "nie mo甜na pobra�� xover\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "b����d podczas pobierania xover.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "niepoprawna linia xover: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "nie mo甜na pobra�� xhdr\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "b����d podczas pobierania xhdr.\n"
 
@@ -480,7 +480,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "wyst��pi�� b����d podczas sesji POP3\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "b����d podczas zapisu konfiguracji do pliku\n"
@@ -512,12 +512,12 @@ msgstr "procmine_get_text_content(): B����d konwersji kodu.\n"
 msgid "can't open mark file\n"
 msgstr "nie mo甜na otworzy�� pliku zaznacze��\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nie mo甜na pobra�� wiadomo��ci %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "B����dny wiersz polecenia wydruku: \"%s\"\n"
@@ -688,7 +688,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "Protok坦��"
 
@@ -1157,7 +1157,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Katalog"
@@ -1190,7 +1190,7 @@ msgstr "Notatka"
 msgid "Warning"
 msgstr "Ostrze甜enie"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "B����d"
 
@@ -1712,7 +1712,7 @@ msgstr "typ MIME"
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "Wy��lij"
@@ -1754,7 +1754,7 @@ msgid "Attach file"
 msgstr "Do����cz plik"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "Podpis"
@@ -1967,7 +1967,7 @@ msgid " Check File "
 msgstr " Sprawd添 plik"
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "Plik"
 
@@ -2045,7 +2045,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2110,7 +2110,7 @@ msgstr "Op坦添nienie (sek)"
 msgid "Maximum Entries"
 msgstr "Maksymalna ilo���� pozycji"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "Podstawowe"
 
@@ -2167,7 +2167,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Wybierz... "
 
@@ -2321,12 +2321,12 @@ msgstr "Ustawianie informacji o katalogu...\n"
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
@@ -2599,7 +2599,7 @@ msgstr "Importuj plik LDIF do ksi��甜ki adresowej"
 msgid "Prev"
 msgstr "Poprzednia"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "Nast��pna"
 
@@ -2620,143 +2620,143 @@ msgstr "Koniec"
 msgid "Sylpheed: %d new messages"
 msgstr "Zako��czono (%d nowe wiadomo��ci)"
 
-#: src/inc.c:388
+#: src/inc.c:433
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Uwierzytelnianie"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "Pobieranie nowych wiadomo��ci"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "Oczekiwanie"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "Anulowano"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "Pobieranie"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Gotowe (%d wiadomo����i (%s) odebrano)"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "Gotowe (brak nowych wiadomo��ci)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "B����d po����czenia"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "B����d autoryzacji"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "Zablokowano"
 
-#: src/inc.c:637
+#: src/inc.c:682
 msgid "Timeout"
 msgstr "Op坦添nienie"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Zako��czono (%d nowe wiadomo��ci)"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "Zako��czono (brak nowych wiadomo��ci)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "Wyst��pi��y b����dy podczas pobierania poczty."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "pobieranie nowych wiadomo��ci z konta %s ...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Uwierzytelnianie"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Pobieranie nowych wiadomo��ci"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Nawi��zywanie po����czenia z serwerem POP3: %s..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, 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:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Uwierzytelnianie..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Pobieranie wiadomo��ci z %s..."
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Pobieranie liczby nowych wiadomo��ci (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Pobieranie liczby nowych wiadomo��ci (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Pobieranie liczby nowych wiadomo��ci (UIDL)"
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "Pobieranie rozmiaru wiadomo��ci (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "Usuwanie wiadomo��ci %d"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "Wychodzenie"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Pobieranie wiadomo��ci (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Pobieranie (%d wiadomo����i (%s) odebrano)"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 msgid "Connection failed."
 msgstr "B����d po����czenia."
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "B����d podczas przetwarzania wiadomo��ci."
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2765,28 +2765,28 @@ msgstr ""
 "B����d podczas przetwarzania wiadomo��ci:\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "Brak miejsca na dysku."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "Nie mo甜na zapisa�� pliku."
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "B����d gniazda."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr "Po����czenie zamkni��te przez zdalny komputer."
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "Skrzynka jest zablokowana."
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2795,11 +2795,11 @@ msgstr ""
 "Skrzynka jest zablokowana:\n"
 "%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 msgid "Authentication failed."
 msgstr "B����d uwierzytelniania."
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2808,15 +2808,15 @@ msgstr ""
 "B����d uwierzytelniania:\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr "Sesja wygas��a."
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "Odbieranie anulowano\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Pobieranie wiadomo��ci z %s do %s...\n"
@@ -3697,7 +3697,7 @@ msgstr "Odbierz now�� poczt�� z wszystkich kont"
 msgid "Send queued message(s)"
 msgstr "Wy��lij wiadomo��ci z kolejki"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Utw坦rz"
@@ -3739,62 +3739,62 @@ msgstr "Usu�� wiadomo����"
 msgid "Set as junk mail"
 msgstr "Ustaw jako domy��lne"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "Wykonaj"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "Wykonaj zaznaczony proces"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "Nast��pna nieprzeczytana wiadomo����"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "Preferencje"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "Wsp坦lne preferencje "
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "Ustawienia konta"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr "Jeste�� offline. Kliknij ikon�� by przej���� do trybu online."
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr "Jeste�� online. Kliknij ikon��, by przej���� do trybu offline."
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "Koniec programu"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "Czy zako��czy�� program?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 #, fuzzy
 msgid "Command line options"
 msgstr "Nie ustawiono polecenia."
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "U甜ycie: %s [OPCJE]...\n"
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3810,7 +3810,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4017,225 +4017,230 @@ msgstr ""
 "Niew��a��ciwe has��o! Spr坦buj ponownie...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "Otwieranie okna preferencji konta...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "Preferencje nowego konta"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Preferencje konta"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "Tworzenie okna preferencji okna...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "Odbieranie"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "Prywatno����"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "Nazwa tego konta"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "Ustaw jako domy��lne"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "Informacje osobiste"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "Pe��na nazwa"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "Adres e-mail"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "Organizacja"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "Informacje o serwerze"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "纏aden (lokalnie)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "Ten serwer wymaga autoryzacji"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "Serwer news"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "Serwer dla odbioru"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "Serwer SMTP (dla wysy��ania)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "Identyfikator u甜ytkownika"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "Has��o"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 msgid "Use secure authentication (APOP)"
 msgstr "U甜yj bezpiecznej autentykacji (APOP)"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "Usuwanie wiadomo��ci z serwera po odebraniu"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "Usuwanie po"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "dniach"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dni: usuwa natychmiast)"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Pobieranie wszystkich wiadomo��ci z serwera"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "Ograniczenie wielko��ci pobierania"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "Filtrowanie wiadomo��ci podczas odbierania"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "Domy��lny inbox"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nieprzefiltrowane wiadomo��ci zostan�� zachowane w tym katalogu)"
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "Spos坦b uwierzytelniania"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "Tylko przy r��cznym odbieraniu"
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "Filtrowanie wiadomo��ci podczas odbierania"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maksymalna liczba pobieranych artyku��坦w\n"
 "(bez ogranicze�� - 0)"
 
-#: src/prefs_account_dialog.c:1024
+#: src/prefs_account_dialog.c:1030
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 msgid "`Get all' checks for new messages on this account"
 msgstr "\"Odbierz wszystkie\" sprawdza poczt�� dla tego konta"
 
-#: src/prefs_account_dialog.c:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Nag��坦wek"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "Dodawanie pola Data do nag��坦wka"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "Generowanie identyrikatora wiadomo��ci"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "Dodawanie nag��坦wka zdefiniowanego przez u甜ytkownika"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr "Edycja..."
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Uwierzytelnianie SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4243,200 +4248,200 @@ msgstr ""
 "Je��li te pola pozostan�� puste, u甜yty zostanie ten sam login i has��o, co przy "
 "odbieraniu."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "Uwierzytelnianie POP3 przed wysy��aniem"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 msgid "Command output"
 msgstr "Wyj��cie polecenia"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 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:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "Kopia"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Ukryta kopia"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "Adres zwrotny"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "Domy��lnie podpisywanie wiadomo��ci"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "Domy��lnie szyfrowanie wiadomo��ci"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "U甜ywanie formatu ASCII-armored dla szyfrowania"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "Wstawianie podpisu czystym tekstem"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "Klucz"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "U甜ywanie standardowego klucza GnuPG"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "Wybieranie klucz poprzez sw坦j adres e-mail"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "R��czne okre��lanie klucza"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "U甜ytkownik lub klucz ID:"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "Nie korzystanie z SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "U甜ywanie SSL dla po����cze�� POP3"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "U甜ywanie polecenia STARTTLS by rozpocz���� sesj�� SSL"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "U甜ywanie SSL dla po����cze�� IMAP4"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "U甜ywanie SSL dla po����cze�� NNTP"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "Wysy��anie (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "U甜ywanie SSL dla po����cze�� SMTP"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr "U甜ywanie nieblokuj��cego SSL"
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 #, 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:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "Okre��l port SMTP"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "Okre��l port POP3"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "Okre��l port IMAP4"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "Okre��l port NNTP"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "Okre��l nazw�� domeny"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "Katalog serwera IMAP4."
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Pobieranie wszystkich wiadomo��ci z serwera"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "Zapisywanie wys��anych wiadomo��ci do"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "Zapisywanie szablon坦w wiadomo��ci do"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Zapisywanie usuni��tych wiadomo��ci do"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "Zapisywanie usuni��tych wiadomo��ci do"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "Nie okre��lono nazwy konta."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "Nie okre��lono adresu e-mail."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "Nie okre��lono serwera SMTP."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "Nie okre��lono ID u甜ytkownika."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "Nie okre��lono serwera POP3."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "Nie okre��lono serwera IMAP4."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "Nie okre��lono serwera NNTP."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6721,35 +6726,35 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 msgid "Sa_ve this image as..."
 msgstr "Zapi_sz grafik�� jako..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Utw坦rz now�� wiadomo����"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Dodaj nadawc�� do _ksi��甜ki adresowej"
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Kopiuj ten _link"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Przegl��darka Web"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr "Kopiuj ten _link"
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6758,7 +6763,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3abb172e..1d2db087 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2007-01-03 13:19-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
@@ -26,194 +26,194 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Lendo as configura巽探es de cada conta...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "A conex達o IMAP4 com %s terminou. Reconectando...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "servidor IMAP4 desabilita LOGIN.\n"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "criando conex達o IMAP4 com %s:%d ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "N達o foi poss鱈vel iniciar sess達o TLS.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, c-format
 msgid "Getting message %d"
 msgstr "Buscando mensagem %d"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Adicionando mensagens em %s (%d / %d)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Movendo mensagens %s para %s ..."
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiando mensagesn %s para %s ..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "Removendo mensagens %s"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "n達o posso marcar como apagado: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "n達o posso eliminar\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Removendo todas as mensagens em %s"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "n達o posso marcar como apagado: 1:*\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "n達o posso fechar pasta\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "pasta raiz %s inexistente\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "erro recebendo resultados do LIST.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "N達o foi poss鱈vel criar '%s'\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "n達o foi poss鱈vel criar '%s' em baixo da INBOX\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "n達o posso criar caixa de correio: LIST falhou\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "n達o posso criar caixa de correio\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "n達o 辿 poss鱈vel renomear caixa de correio: %s para %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "n達o posso apagar caixa de correio\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "N達o foi poss鱈vel obter o 'envelope'\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Buscando cabe巽alhos das mensagens (%d / %d)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "Ocorreu um erro ao obter 'envelope'\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "n達o foi poss鱈vel realizar o parse no envelope: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "N達o foi poss鱈vel se conectar ao servidor IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "N達o foi poss鱈vel estabelecer uma sess達o IMAP4 com: %s:%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "N達o foi poss鱈vel obter o 'envelope'\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "n達o posso selecionar pasta: %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 msgid "error on imap command: STATUS\n"
 msgstr "erro no comando imap: STATUS\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 msgid "IMAP4 authentication failed.\n"
 msgstr "Falha na autentica巽達o IMAP4.\n"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "Falha ao logar no servidor IMAP4.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "n達o foi poss鱈vel copiar a mensagem %s para %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(enviando arquivo...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "n達o foi poss鱈vel anexar a mensagem em %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "n達o posso copiar %s para %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erro no comando imap: STORE %s %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 msgid "error while imap command: CLOSE\n"
 msgstr "erro no comando imap: CLOSE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "o iconv n達o pode converter UTF-7 para %s\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "o iconv n達o pode converter %s para UTF-7\n"
@@ -300,25 +300,25 @@ msgstr "n達o foi poss鱈vel zerar o mailbox.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportando mensagens de %s em %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "n達o foi poss鱈vel copiar a mensagem %s para %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "N達o foi poss鱈vel abrir o arquivo de marcas.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "pastas de origem e destino s達o id棚nticas.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copiando mensagem %s%c%d para %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -327,7 +327,7 @@ msgstr ""
 "O arquivo `%s' j叩 existe.\n"
 "N達o foi poss鱈vel criar a pasta."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -346,77 +346,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "criando conex達o NNTP com %s:%d ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "A conex達o NNTP com %s:%d terminou. Reconectando...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "o artigo %d j叩 est叩 no cache.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "obtendo artigo %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "n達o foi poss鱈vel ler o artigo %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "n達o posso postar artigo.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "n達o foi poss鱈vel obter o artigo %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "n達o foi poss鱈vel selecionar o grupo: %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "intervalo de artigos inv叩lido: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "n達o h叩 novos artigos.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obtendo xover %d - %d en %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "n達o foi poss鱈vel obter xover\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "ocorreu um erro ao obter xover.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "linha xover inv叩lida: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "n達o foi poss鱈vel obter xover\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "ocorreu um erro ao obter xover.\n"
 
@@ -494,7 +494,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "Erro na sess達o POP3\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "falhou ao gravar a configura巽達o no arquivo\n"
@@ -524,12 +524,12 @@ msgstr "procmime_get_text_content(): Convers達o de c坦digo falhou.\n"
 msgid "can't open mark file\n"
 msgstr "n達o foi poss鱈vel abrir o arquivo de marcas\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "n達o posso obter mensagem %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "O comando de impress達o 辿 inv叩lido: `%s'\n"
@@ -698,7 +698,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nome"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -1162,7 +1162,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Pasta"
@@ -1195,7 +1195,7 @@ msgstr "Notifica巽達o"
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "Erro"
 
@@ -1719,7 +1719,7 @@ msgstr "Tipo MIME"
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "Enviar"
@@ -1761,7 +1761,7 @@ msgid "Attach file"
 msgstr "Anexar arquivo"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "Assinatura"
@@ -1968,7 +1968,7 @@ msgid " Check File "
 msgstr " Verificar Arquivo "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "Arquivo"
 
@@ -2047,7 +2047,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2112,7 +2112,7 @@ msgstr "Timeout (segundos)"
 msgid "Maximum Entries"
 msgstr "M叩ximo de Entradas"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "B叩sicas"
 
@@ -2171,7 +2171,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "Selecionar..."
 
@@ -2321,12 +2321,12 @@ msgstr "Configurando informa巽探es da pasta...\n"
 msgid "Setting folder info..."
 msgstr "Configurando informa巽探es da pasta..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
@@ -2600,7 +2600,7 @@ msgstr "Importar arquivo LDIF para o Livro de Endere巽os"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "Pr坦xima"
 
@@ -2621,142 +2621,142 @@ msgstr "Terminar"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d novas mensagens"
 
-#: src/inc.c:388
+#: src/inc.c:433
 msgid "Authenticating with POP3"
 msgstr "Autenticando via POP3"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "Obtendo novas mensagens"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "Aguardando"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Conclu鱈do (%d mensagen(s) (%s) recebida(s))"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "Feito (N達o h叩 mensagens novas)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "Conex達o falhou"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "Autentica巽達o falhou"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "Travado"
 
-#: src/inc.c:637
+#: src/inc.c:682
 msgid "Timeout"
 msgstr "Tempo limite"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Conclu鱈do (%d nova(s) mensagem(ns))"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "Conclu鱈do (N達o h叩 mensagens novas)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "Alguns erros aconteceram ao baixar os emails."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obtendo novas mensagens da conta %s...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Autenticando via POP3"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando novas mensagens"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando ao servidor POP3: %s..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, 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:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Recebendo mensagens de %s..."
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtendo o n炭mero de novas mensagens (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtendo o n炭mero de novas mensagens (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtendo o n炭mero de novas mensagens (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o n炭mero de novas mensagens (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "Apagando mensagem %d"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "Saindo"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Baixando mensagem (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Recebendo (%d mensagem(ns) (%s) recebido)"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 msgid "Connection failed."
 msgstr "Falha na conex達o"
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "Ocorreu um erro enquanto as mensagens eram processadas."
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2765,28 +2765,28 @@ msgstr ""
 "Erro ao processar mensagens:\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "N達o h叩 espa巽o dispon鱈vel no disco."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "N達o foi poss鱈vel gravar o arquivo."
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "erro de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr "Conex達o remota finalizada pela esta巽達o remota."
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "Caixa de correio est叩 travada."
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2795,11 +2795,11 @@ msgstr ""
 "Caixa de correio est叩 trancada:\n"
 "%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 msgid "Authentication failed."
 msgstr "Falha de autentica巽達o."
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2808,15 +2808,15 @@ msgstr ""
 "Falha de autentica巽達o:\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr "Tempo limite da sess達o."
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "Incorpora巽達o cancelada\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obtendo novas mensagens de %s at辿 %s...\n"
@@ -3694,7 +3694,7 @@ msgstr "Incorporar novas mensagens de todas as contas"
 msgid "Send queued message(s)"
 msgstr "Enviar Mensagem(s) da fila"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Escrever"
@@ -3735,60 +3735,60 @@ msgstr "Apagar a mensagem"
 msgid "Set as junk mail"
 msgstr "Marcar como spam"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "Executar"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "Executar os processos marcados"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "Pr坦xima mensagem n達o lida"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "Prefer棚ncias"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "Prefer棚ncias comuns"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Conta"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "Prefer棚ncias da conta"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr "Voc棚 est叩 desconectado. Clique no 鱈cone para conectar."
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr "Voc棚 est叩 conectado. Clique no 鱈cone para desconectar."
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "Sair do programa?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 msgid "Command line options"
 msgstr "Op巽探es de linha de comando"
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OP����O]..."
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3816,7 +3816,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4037,217 +4037,222 @@ msgstr ""
 "Senha errada! Tente novamente...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "Abrindo janela de prefer棚ncias da conta...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "Conta%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "Prefer棚ncias para a nova conta"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Prefer棚ncias da Conta"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "Criando janela de prefer棚ncias da conta...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "Receber"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "Avan巽adas"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "Nome desta conta"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "Marcar como padr達o"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "Informa巽探es pessoais"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "Nome completo"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "Endere巽o de e-mail"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "Organiza巽達o"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "Informa巽探es do servidor"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "Not鱈cias (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "Nenhuma (local)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "Este servidor requer autentica巽達o"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "Servidor de not鱈cias"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "Servidor de recep巽達o"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (envio)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "Usuario"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "Senha"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 msgid "Use secure authentication (APOP)"
 msgstr "Usar autentica巽達o segura (APOP)"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "Ao receber, eliminar a(s) mensagem(ns) do servidor"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "Remover depois de"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "dias"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 msgid "0 days: remove immediately"
 msgstr "0 dias: remover imediatamente"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 msgid "Download all messages (including already received) on server"
 msgstr "Receber todas as mensagens (incluindo as j叩 recebidas) no servidor"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "Limite de tamanho de recebimento"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensagens ao receber"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "Caixa de Entrada Padr達o"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Mensagens n達o filtradas ser達o guardadas nesta pasta."
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "M辿todo de Autentica巽達o"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "Autom叩tico"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
 msgstr "Verificar apenas CAIXA DE ENTRADA no rebecimento"
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "Filtrar mensagens ao receber"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "Not鱈cias"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 msgid "Maximum number of articles to download"
 msgstr "N炭mero m叩ximo de artigos para baixar"
 
-#: src/prefs_account_dialog.c:1024
+#: src/prefs_account_dialog.c:1030
 msgid "No limit if 0 is specified."
 msgstr "Sem limite se 0 for especificado."
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Obter todas' confere novas mensagens nessa conta"
 
-#: src/prefs_account_dialog.c:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Cabe巽alho"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "Adicionar campo de data"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "Gerar Message-ID"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "Adicionar cabe巽alho do usu叩rio"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " Editar... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "Autentica巽達o"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentica巽達o SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4255,197 +4260,197 @@ msgstr ""
 "Se voc棚 deixar essas entradas em branco, o mesmo ID de usu叩rio e senha do "
 "recebimento ser達o usados."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "Autenticar com POP3 antes de enviar"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr "Entrada direta"
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 msgid "Command output"
 msgstr "Sa鱈da de comando"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Estabelecer os seguintes endere巽os automaticamente"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "Responder"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "Assinar mensagens por padr達o"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "Encriptar mensagems por padr達o"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr "Encriptar quando responder uma mensagem encriptada"
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "Usar formato ASCII-armored para encripta巽達o"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "Inserir assinatura de texto puro"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "Assinar chave"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "Usar chave GnuPG padr達o"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "Selecionar chave atrav辿s de seu endere巽o de e-mail"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "Especificar chave manualmente"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "Usu叩rio ou ID da chave:"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "N達o usar SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "Utilizar SSL para conex達o POP3"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Utilizar comando STARTTLS para iniciar a sess達o SSL"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "Utilizar SSL para conex達o IMAP4"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para conex達o NNTP"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "Utilizar SSL para conex達o SMTP"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr "Usar SSL n達o-bloqueante"
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 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:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "Especifique a porta SMTP"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "Especifique a porta POP3"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "Especificar a porta IMAP4"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "Especificar a porta NNTP"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "Especificar nome do dom鱈nio"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "Servidor de diret坦rio IMAP"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 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:1760
+#: src/prefs_account_dialog.c:1767
 msgid "Clear all message caches on exit"
 msgstr "Limpar todos os caches de mensagens ao sair"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "Colocar mensagens enviadas em"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "Colocar mensagens de rascunho em"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 msgid "Put queued messages in"
 msgstr "Colocar mensagens a serem enviadas em"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "Colocar mensagens apagadas em"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "Nome da conta n達o definido."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "Endere巽o de e-mail n達o especificado."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "Servidor SMTP n達o especificado."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "Usu叩rio n達o especificado."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "Servidor POP3 n達o especificado."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "Servidor IMAP4 n達o especificado."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "Servidor NNTP n達o especificado."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr "A pasta especificada n達o 辿 do tipo fila."
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6680,31 +6685,31 @@ msgstr ""
 "O corpo do texto n達o pode ser exibido devido a um erro ao gravar para o "
 "arquivo tempor叩rio.\n"
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 msgid "Sa_ve this image as..."
 msgstr "_Salvar imagem como..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Escrever _nova mensagem"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 msgid "Add to address _book..."
 msgstr "Adicionar ao _cat叩logo de endere巽os"
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 msgid "Copy this add_ress"
 msgstr "Copiar este _endere巽o"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 msgid "_Open with Web browser"
 msgstr "A_brir com o navegador Web"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr "Copiar este _link"
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6717,7 +6722,7 @@ msgstr ""
 "\n"
 "Abr鱈-la mesmo assim?"
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr "Aviso de URL falsa"
 
diff --git a/po/ro.po b/po/ro.po
index 2ee27ba8..f136dfc7 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2006-12-19 19:09+0200\n"
 "Last-Translator: Cristian Secar�� <cristi@secarica.ro>\n"
 "Language-Team: \n"
@@ -19,200 +19,200 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Citire configur��ri pentru fiecare cont...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Conexiunea IMAP4 la %s a fost 樽ntrerupt��. Reconectare...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Serverul IMAP4 dezactiveaz�� LOGIN.\n"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "creare conexiune IMAP4 la %s:%d ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "Nu se poate lansa sesiunea TLS.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, c-format
 msgid "Getting message %d"
 msgstr "Ob��inere mesaj %d"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Ad��ugare mesaje la %s (%d / %d)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Mutare mesaje %s la %s ..."
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiere mesaje %s la %s ..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "��tergere mesaje %s"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nu se poate seta marcajul de ��tergere: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "nu se poate elimina\n"
 
 # hm ? din sau 樽n ?
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "��tergere mesaje din %s"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nu se poate seta marcajul de ��tergere: 1:*\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "nu se poate 樽nchide folderul\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "folderul root %s nu exist��\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "a ap��rut o eroare 樽n timpul ob��ineriii 'LIST'.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Nu se poate crea '%s'\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Nu se poate crea '%s' 樽n INBOX\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nu se poate crea c��su��a po��tal��: LIST a e��uat.\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "nu se poate crea c��su��a po��tal��\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nu se poate redenumi c��su��a po��tal��: %s 樽n %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "nu se poate ��terge c��su��a po��tal��\n"
 
 # hm ? envelope conform wikipedia
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "nu se poate ob��ine 'envelope' (informa��ia de routing)\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Ob��inere header-e mesaje (%d / %d)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr ""
 "a ap��rut o eroare 樽n timpul ob��inerii 'envelope' (informa��ia de routing).\n"
 
 # hm ? envelope conform wikipedia
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "'envelope' (informa��ia de routing) nu poate fi analizat: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nu se poate efectua conexiunea la serverul IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nu se poate stabili sesiunea IMAP4 cu: %s:%d\n"
 
 # hm ?
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "nu se poate ob��ine spa��iul de nume\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nu se poate selecta folderul: %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 msgid "error on imap command: STATUS\n"
 msgstr "eroare la comanda IMAP: STATUS\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autentificarea IMAP4 a e��uat.\n"
 
 # hm ? cu ce difer�� de authentication ?
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificarea IMAP4 a e��uat.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nu se poate ad��uga %s la %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(trimitere fi��ier...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nu se poate ad��uga mesajul la %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nu se poate copia %s la %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "eroare comand�� IMAP: STORE:%s %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "eroare comand�� IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 msgid "error while imap command: CLOSE\n"
 msgstr "eroare comand�� IMAP: CLOSE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nu poate efectua conversia UTF-7 la %s\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nu poate efectua conversia %s la UTF-7\n"
@@ -299,25 +299,25 @@ msgstr "nu se poate reteza la zero c��su��a po��tal��.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportare mesaje din %s 樽n %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "nu se poate copia mesajului %s 樽n %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "Nu se poate deschide fi��ierul de marcaj.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "folderul surs�� este identic cu cel destina��ie.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copiere mesaj %s%c%d 樽n %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -326,7 +326,7 @@ msgstr ""
 "Fi��ierul '%s' exist�� deja.\n"
 "Nu se poate crea folderul."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -345,77 +345,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "creare conexiune NNTP la %s:%d ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "Conexiunea NNTP la %s:%d a fost 樽ntrerupt��. Reconectare...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "Articolul %d a fost deja memorat 樽n cache.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "ob��inere articol %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "nu se poate citi articolul %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "nu se poate trimite articolul.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "nu se poate recep��iona articolul %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "nu se poate selecta grupul: %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "interval invalid: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "nu exist�� articole noi.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "ob��inere xover %d - %d 樽n %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "nu se poate ob��ine xover\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "a ap��rut o eroare 樽n timpul ob��inerii 'xover'.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "linie xover invalid��: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "nu se poate ob��ine xhdr\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "a ap��rut o eroare 樽n timpul ob��inerii 'xhdr'.\n"
 
@@ -495,7 +495,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "a ap��rut o eroare la sesiunea POP3\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "scrierea configura��ie 樽n fi��ier a e��uat\n"
@@ -525,12 +525,12 @@ msgstr "procmime_get_text_content(): conversia codului a e��uat.\n"
 msgid "can't open mark file\n"
 msgstr "nu se poate deschide fi��ierul de marcaj\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nu se poate prelua mesajul %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Linia de comand�� pentru tip��rire este invalid��: '%s'\n"
@@ -703,7 +703,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nume"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "Protocol"
 
@@ -1177,7 +1177,7 @@ msgid "Group"
 msgstr "Grup��"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Folder"
@@ -1210,7 +1210,7 @@ msgstr "Notificare"
 msgid "Warning"
 msgstr "Avertisment"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "Eroare"
 
@@ -1739,7 +1739,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:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "Trimite"
@@ -1782,7 +1782,7 @@ msgid "Attach file"
 msgstr "Ata��eaz�� fi��ier"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "Semn��tur��"
@@ -1989,7 +1989,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:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "Fi��ier"
 
@@ -2068,7 +2068,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2134,7 +2134,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:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "De baz��"
 
@@ -2192,7 +2192,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Selecteaz��... "
 
@@ -2344,12 +2344,12 @@ msgstr "Setare informa��ii folder...\n"
 msgid "Setting folder info..."
 msgstr "Setare informa��ii folder..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Scanare folder %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Scanare folder %s ..."
@@ -2632,7 +2632,7 @@ msgid "Prev"
 msgstr "Precedent"
 
 # hm ? sau 樽nainte ?
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "Urm��tor"
 
@@ -2653,143 +2653,143 @@ msgstr "Terminat"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d mesaje noi"
 
-#: src/inc.c:388
+#: src/inc.c:433
 msgid "Authenticating with POP3"
 msgstr "Autentificare cu POP3"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "Recep��ionare mesaje noi"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "A��teptare"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "Anulat"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "Recep��ionare"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Gata (%d mesaj(e) (%s) primit(e))"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "Gata (nu exist�� mesaje noi)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "Conexiunea a e��uat"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "Autentificarea a e��uat"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "Blocat"
 
-#: src/inc.c:637
+#: src/inc.c:682
 msgid "Timeout"
 msgstr "Timp expirat"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Terminat (%d noi mesaj(e))"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "Terminat (nu exist�� mesaje noi)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "Au avut loc unele erori 樽n timpul ob��inerii mail-ului."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "ob��inere mesaje noi pentru contul %s...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Autentificare cu POP3"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: recep��ionare mesaje noi"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectare la serverul POP3: %s ..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, 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:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Autentificare..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Recep��ionare mesaje de la %s..."
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Ob��inerea num��rului de mesaje noi (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Ob��inerea num��rului de mesaje noi (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Ob��inerea num��rului de mesaje noi (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "Ob��inerea dimensiunii mesajelor (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "��tergere mesaje %d"
 
 # hm ?
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "��nchidere conexiune"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recep��ionare mesaj (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Recep��ionare (%d mesaj(e) (%s) primit(e))"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 msgid "Connection failed."
 msgstr "Conexiunea a e��uat"
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "A ap��rut o eroare 樽n timpul proces��rii mail-ului."
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2798,28 +2798,28 @@ msgstr ""
 "A ap��rut o eroare 樽n timpul proces��rii mail-ului.\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "Nu mai este spa��iu pe disc."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "Nu se poate scrie fi��ierul."
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "Eroare socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr "Conexiune 樽nchis�� de serverul de la distan����."
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "C��su��a po��tal�� este blocat��"
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2828,11 +2828,11 @@ msgstr ""
 "C��su��a po��tal�� este blocat��:\n"
 "%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 msgid "Authentication failed."
 msgstr "Autentificarea a e��uat."
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2841,15 +2841,15 @@ msgstr ""
 "Autentificarea a e��uat:\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr "Timpul sesiunii a expirat."
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "��ncorporarea a fost anulat��\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Ob��inere mesaje noi de la %s 樽n %s...\n"
@@ -3741,7 +3741,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:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Compune"
@@ -3783,62 +3783,62 @@ msgstr "��terge mesajul"
 msgid "Set as junk mail"
 msgstr "Marcheaz�� ca spam"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "Execut��"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "Execut�� procesele marcate"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "Urm��torul mesaj necitit"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "Preferin��e"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "Preferin��e comune"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Cont"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "Set��ri cont"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Sunte��i 樽n modul deconectat. Clic pe icon pentru a trece 樽n modul conectat."
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 "Sunte��i 樽n modul conectat. Clic pe icon pentru a trece 樽n modul deconectat."
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "Ie��ire"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "Ie��i��i din acest program ?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 msgid "Command line options"
 msgstr "Op��iuni line de comand��"
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Utilizare: sylpheed [OP��IUNE]..."
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3866,7 +3866,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4090,220 +4090,225 @@ msgstr ""
 "Fraz�� secret�� incorect�� ! ��ncearc�� din nou...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "Deschidere fereastr�� de configura��ie cont...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "Cont%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "Preferin��e pentru noul cont"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Preferin��e cont"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 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:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "Primire"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "Confiden��ialitate"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "Avansat"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "Numele contului"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "Stabile��te ca implicit"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "Informatii personale"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "Nume complet"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "Adresa de mail"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "Organiza��ie"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "Informatii despre server"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "Nimic (local)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "Serverul necesit�� autentificare."
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "Server news"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "Server pentru primire"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "Server SMTP (trimitere)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "Utilizator"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "Parol��"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 msgid "Use secure authentication (APOP)"
 msgstr "Folose��te autentificare securizat�� (APOP)"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "��terge mesajele de pe server la primire"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "��terge dup��"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "zile"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 msgid "0 days: remove immediately"
 msgstr "0 zile: ��terge imediat"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 msgid "Download all messages (including already received) on server"
 msgstr "Descarc�� toate mesajele de pe server (inclusiv cele deja recep��ionate)"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "Limit�� dimensiune pentru primire"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "Filtreaz�� mesajele la primire"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "Inbox-ul implicit"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Mesajele nefiltrate vor fi stocate 樽n acest folder."
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "Metod�� de autentificare"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "Automat"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
 msgstr "Verific�� doar INBOX la primire"
 
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "Filtreaz�� mesajele la primire"
+
 # !!! netradus !!!
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 msgid "Maximum number of articles to download"
 msgstr "Num��r maxim de articole pentru desc��rcare"
 
-#: src/prefs_account_dialog.c:1024
+#: src/prefs_account_dialog.c:1030
 msgid "No limit if 0 is specified."
 msgstr "F��r�� limit�� dac�� este specificat 0"
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 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:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Header"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "Adaug�� c但mp Dat��"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "Genereaz�� Message-ID"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "Adaug�� c但mpuri definite de utilizator"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " Editare... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "Autentificare"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentificare SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4311,200 +4316,200 @@ msgstr ""
 "Dac�� l��sa��i goale aceste intr��ri, se va utiliza acela��i nume utilizator ��i "
 "aceea��i parol�� ca ��i pentru primire."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentific�� cu POP3 樽nainte de a trimite"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr "Introducere direct��"
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 msgid "Command output"
 msgstr "Rezultat command��"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 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:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "Semneaz�� mesajele 樽n mod implicit"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "Cripteaz�� mesajele 樽n mod implicit"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr "Cripteaz�� r��spunsul la un mesaj criptat"
 
 # !!! l��sat netradus !!!
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "Folose��te formatul de criptare ASCII-armored"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "Folose��te semn��tur�� 樽n text clar"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "Semneaz�� cheia"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "Folose��te cheia implicit�� GnuPG"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "Selecteaz�� cheia dup�� adresa dumneavoastr�� de e-mail"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "Specific�� manual cheia"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "ID utilizator sau cheie"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "Nu utiliza SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "Folose��te SSL pentru conexiunea POP3"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Folose��te comanda STARTTLS pentru a porni sesiunea SSL"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "Folose��te SSL pentru conexiunea IMAP4"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "Folose��te SSL pentru conexiunea NNTP"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "Trimite (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "Folose��te SSL pentru conexiunea SMTP"
 
 # hm ? sau f��r�� blocare ?
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr "Folose��te SSL non-blocking"
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 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:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "Port SMTP"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "Port POP3"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "Specific�� port IMAP4"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "Specific�� port NNTP"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "Nume domeniu"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "Director server IMAP"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 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:1760
+#: src/prefs_account_dialog.c:1767
 msgid "Clear all message caches on exit"
 msgstr "��terge la ie��ire toate mesajele din cache"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "Pune mesajele trimise 樽n"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "Pune ciorna 樽n"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 msgid "Put queued messages in"
 msgstr "Pune mesajele de la coad�� 樽n"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "Pune mesajele ��terse 樽n"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "Nu este introdus numele contului."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "Adresa de mail nu a fost introdus��."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "Serverul SMTP nu a fost introdus."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "Nu a fost introdus numele utilizator."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "Serverul POP3 nu a fost introdus."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "Serverul IMAP4 nu a fost introdus."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "Serverul NNTP nu a fost introdus."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr "Folderul specificat nu este folder de coad��."
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6762,32 +6767,32 @@ msgstr ""
 "Corpul mesajului nu a putut fi afi��at, deoarece scrierea 樽n fi��ierul "
 "temporar a e��uat.\n"
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 msgid "Sa_ve this image as..."
 msgstr "Sal_veaz�� acest�� imagine ca..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Compune mesaj _nou"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 msgid "Add to address _book..."
 msgstr "Ad��ug�� 樽n a_gend��..."
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 msgid "Copy this add_ress"
 msgstr "Copiaz�� aceast�� ad_res��"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 msgid "_Open with Web browser"
 msgstr "_Deschide cu browser Web"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr "Copiaz�� acest _link"
 
 # !!! de verificat cum arat�� practic !!!
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6800,7 +6805,7 @@ msgstr ""
 "\n"
 "��l deschid oricum ?"
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr "Avertizare de URL fals"
 
diff --git a/po/ru.po b/po/ru.po
index 37159600..c89a03a0 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+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"
@@ -20,194 +20,194 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "丼��亠仆亳亠 仆舒������仂亠从 ��������仆���� 亰舒仗亳��亠亶...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "弌仂亠亟亳仆亠仆亳亠 IMAP4 �� %s 仗��亠��于舒仆仂. ��仂������舒仆仂于仍亠仆亳亠 ��仂亠亟亳仆亠仆亳��...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "弌亠��于亠�� IMAP4 亰舒仗��亠��舒亠�� 亳��仗仂仍��亰仂于舒仆亳亠 从仂仄舒仆亟�� LOGIN.\n"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "������舒仆仂于仍亠仆亳亠 ��仂亠亟亳仆亠仆亳�� IMAP4 �� %s:%d ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "��亠 ��亟舒仍仂���� 仆舒��舒���� ��亠舒仆�� TLS.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, c-format
 msgid "Getting message %d"
 msgstr "��仂仍����亠仆亳亠 ��仂仂弍��亠仆亳�� %d"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "��仂弍舒于仍亠仆亳亠 ��仂仂弍��亠仆亳亶 于 %s (%d / %d)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "��亠��亠仄亠��亠仆亳亠 ��仂仂弍��亠仆亳亶 %s 于 %s ..."
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "��仂仗亳��仂于舒仆亳亠 ��仂仂弍��亠仆亳亶 %s 于 %s ..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "丕亟舒仍亠仆亳亠 ��仂仂弍��亠仆亳亶 %s"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "仆亠 ��亟舒仍仂���� ������舒仆仂于亳���� ��仍舒亞 ��亟舒仍亠仆亳��: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "仆亠 ��亟舒仍仂���� 仂��亳����亳���� 仗舒仗从�� 仂�� ��亟舒仍��仆仆���� ��仂仂弍��亠仆亳亶\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "丕亟舒仍亠仆亳亠 于��亠�� ��仂仂弍��亠仆亳亶 亳亰 %s"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "仆亠 ��亟舒仍仂���� ������舒仆仂于亳���� ��仍舒亞 ��亟舒仍亠仆亳��: 1:*\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "仆亠于仂亰仄仂亢仆仂 亰舒从�������� 仗舒仗从��\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "从仂��仆亠于舒�� 仗舒仗从舒 %s 仆亠 ������亠����于��亠��\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "仗��仂亳亰仂��仍舒 仂��亳弍从舒 仗��亳 仗仂仍����亠仆亳亳 LIST.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "����亳弍从舒 仗��亳 ��仂亰亟舒仆亳亳 \"%s\"\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "����亳弍从舒 仗��亳 ��仂亰亟舒仆亳亳 \"%s\" 于仆������亳 INBOX\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "仆亠 ��亟舒仍仂���� ��仂亰亟舒���� 仗仂����仂于��亶 ����亳从: 仂��亳弍从舒 LIST\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "仆亠 ��亟舒仍仂���� ��仂亰亟舒���� 仗仂����仂于��亶 ����亳从\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "仆亠 ��亟舒仍仂���� 仗亠��亠亳仄亠仆仂于舒���� 仗仂����仂于��亶 ����亳从 %s 于 %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "仆亠 ��亟舒仍仂���� ��亟舒仍亳���� 仗仂����仂于��亶 ����亳从\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "仆亠 ��亟舒仍仂���� 仗仂仍����亳���� 亟舒仆仆��亠 从仂仆于亠����舒\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "��仂仍����亠仆亳亠 亰舒亞仂仍仂于从仂于 ��仂仂弍��亠仆亳亶 (%d / %d)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "仂��亳弍从舒 仗��亳 仗仂仍����亠仆亳亳 亟舒仆仆���� 从仂仆于亠����舒.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "仂��亳弍从舒 仗��亳 ��舒亰弍仂��亠 亟舒仆仆���� 从仂仆于亠����舒: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "��亠 ��亟舒仍仂���� ��仂亠亟亳仆亳�������� �� ��亠��于亠��仂仄 IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "��亠 ��亟舒仍仂���� 仂��从�������� ��亠舒仆�� ��于�磶亳 IMAP4 c %s:%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "仆亠 ��亟舒仍仂���� 仗仂仍����亳���� 仗��仂������舒仆����于仂 亳仄��仆\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "仆亠于仂亰仄仂亢仆仂 于��弍��舒���� 仗舒仗从��: %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 msgid "error on imap command: STATUS\n"
 msgstr "仂��亳弍从舒 仗��亳 于��仗仂仍仆亠仆亳亳 从仂仄舒仆亟�� IMAP: STATUS\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 msgid "IMAP4 authentication failed.\n"
 msgstr "����亳弍从舒 舒����亠仆��亳��亳从舒��亳亳 IMAP4.\n"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "����亳弍从舒 舒于��仂��亳亰舒��亳亳 IMAP4.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "仆亠 ��亟舒仍仂���� 亟仂弍舒于亳���� %s 从 %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(仗亠��亠亟舒��舒 ��舒亶仍舒...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "仆亠 ��亟舒仍仂���� 亟仂弍舒于亳���� ��仂仂弍��亠仆亳亠 从 %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "仆亠 ��亟舒仍仂���� ��从仂仗亳��仂于舒���� %s 于 %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "仂��亳弍从舒 仗��亳 于��仗仂仍仆亠仆亳亳 从仂仄舒仆亟�� IMAP: STORE %s %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "仂��亳弍从舒 仗��亳 于��仗仂仍仆亠仆亳亳 从仂仄舒仆亟�� IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 msgid "error while imap command: CLOSE\n"
 msgstr "仂��亳弍从舒 仗��亳 于��仗仂仍仆亠仆亳亳 从仂仄舒仆亟�� IMAP: CLOSE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "仂��亳弍从舒 仗��亠仂弍��舒亰仂于舒仆亳�� iconv 亳亰 UTF-7 于 %s\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "仂��亳弍从舒 仗��亠仂弍��舒亰仂于舒仆亳�� iconv 亳亰 %s 于 UTF-7\n"
@@ -295,25 +295,25 @@ msgstr "仆亠 ��亟舒仍仂���� 仂弍��亠亰舒���� 仗仂����仂于��亶 ����亳从 亟仂 仆��
 msgid "Exporting messages from %s into %s...\n"
 msgstr "亅从��仗仂���� ��仂仂弍��亠仆亳亶 亳亰 %s 于 %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "仆亠 ��亟舒仍仂���� ��从仂仗亳��仂于舒���� ��仂仂弍��亠仆亳亠 %s 于 %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "��亠 ��亟舒仍仂���� 仂��从�������� ��舒亶仍 仗仂仄亠��仂从.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "亳����仂亟仆舒�� 仗舒仗从舒 ��仂于仗舒亟舒亠�� �� 仗舒仗从仂亶 仆舒亰仆舒��亠仆亳��.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "��仂仗亳��仂于舒仆亳亠 ��仂仂弍��亠仆亳�� %s%c%d 于 %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -322,7 +322,7 @@ msgstr ""
 "个舒亶仍 \"%s\" ��亢亠 ������亠����于��亠��.\n"
 "��亠仍��亰�� ��仂亰亟舒���� 仗舒仗从�� �� ��舒从亳仄 亢亠 亳仄亠仆亠仄."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -341,77 +341,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "��仂亠亟亳仆亠仆亳亠 NNTP �� %s:%d ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "��仂��亠���礌仂 ��仂亠亟亳仆亠仆亳亠 NNTP �� %s:%d. ��仂仗����从舒 于仂������舒仆仂于仍亠仆亳��...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "����舒������ %d ��亢亠 于 从亠��亠.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "仗仂仍����亠仆亳亠 ����舒����亳 %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "仂��亳弍从舒 ����亠仆亳�� ����舒����亳 %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "仂��亳弍从舒 仂��仗��舒于从亳 ����舒����亳.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "仂��亳弍从舒 仗仂仍����亠仆亳�� ����舒����亳 %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "仆亠 ��亟舒仍仂���� 于��弍��舒���� 亞����仗仗��: %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "仆亠于亠��仆��亶 亟亳舒仗舒亰仂仆 ����舒��亠亶: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "仆仂于���� ����舒��亠亶 仆亠��.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "亰舒亞����亰从舒 xover %d - %d 于 %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "仆亠 ��亟舒仍仂���� 亰舒亞����亰亳���� xover\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "仗��仂亳亰仂��仍舒 仂��亳弍从舒 仗��亳 仗仂仍����亠仆亳亳 xover.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "仆亠于亠��仆舒�� ������仂从舒 xover: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "仆亠 ��亟舒仍仂���� 亰舒亞����亰亳���� xhdr\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "仗��仂亳亰仂��仍舒 仂��亳弍从舒 仗��亳 仗仂仍����亠仆亳亳 xhdr.\n"
 
@@ -489,7 +489,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "仂��亳弍从舒 ��亠舒仆��舒 POP3\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "仂��亳弍从舒 仗��亳 亰舒仗亳��亳 仆舒������仂亠从 于 ��舒亶仍\n"
@@ -520,12 +520,12 @@ msgstr "procmime_get_text_content(): ����亳弍从舒 仗��亠仂弍��舒亰仂于舒仆亳�� �
 msgid "can't open mark file\n"
 msgstr "仂��亳弍从舒 仂��从������亳�� ��舒亶仍舒 仗仂仄亠��仂从\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "仆亠 ��亟舒仍仂���� 仗仂仍����亳���� ��仂仂弍��亠仆亳亠 %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "��亠仗��舒于亳仍��仆舒�� 从仂仄舒仆亟舒 仗亠��舒��亳: \"%s\"\n"
@@ -696,7 +696,7 @@ msgstr ""
 msgid "Name"
 msgstr "��仄��"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "����仂��仂从仂仍"
 
@@ -1159,7 +1159,7 @@ msgid "Group"
 msgstr "������仗仗舒"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "��舒仗从舒"
@@ -1192,7 +1192,7 @@ msgstr "丕于亠亟仂仄仍亠仆亳亠"
 msgid "Warning"
 msgstr "����亠亟��仗��亠亢亟亠仆亳亠"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "����亳弍从舒"
 
@@ -1711,7 +1711,7 @@ msgstr "丐亳仗 MIME"
 msgid "Size"
 msgstr "��舒亰仄亠��"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "����仗��舒于亳����"
@@ -1753,7 +1753,7 @@ msgid "Attach file"
 msgstr "��仍仂亢亳���� ��舒亶仍"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "��仂亟仗亳����"
@@ -1961,7 +1961,7 @@ msgid " Check File "
 msgstr " ����仂于亠��亳���� ��舒亶仍 "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "个舒亶仍"
 
@@ -2039,7 +2039,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2104,7 +2104,7 @@ msgstr "丐舒亶仄-舒���� (��亠从)"
 msgid "Maximum Entries"
 msgstr "��舒从��亳仄舒仍��仆��亶 ��舒亰仄亠�� ��亠亰��仍����舒��舒"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "����仆仂于仆��亠"
 
@@ -2162,7 +2162,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " ����弍仂��... "
 
@@ -2313,12 +2313,12 @@ msgstr "丕����舒仆仂于从舒 亳仆��仂��仄舒��亳亳 仂 仗舒仗从亠...\n"
 msgid "Setting folder info..."
 msgstr "丕����舒仆仂于从舒 亳仆��仂��仄舒��亳亳 仂 仗舒仗从亠..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "����仂��仄仂���� 仗舒仗从亳 %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "����仂��仄仂���� 仗舒仗从亳 %s ..."
@@ -2591,7 +2591,7 @@ msgstr "��仄仗仂���� ��舒亶仍舒 LDIF 于 舒亟��亠��仆���� 从仆亳亞��"
 msgid "Prev"
 msgstr "��舒亰舒亟"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "��舒仍亠亠"
 
@@ -2612,143 +2612,143 @@ msgstr "��舒于亠����亠仆亳亠"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed (仆仂于���� ��仂仂弍��亠仆亳亶: %d)"
 
-#: src/inc.c:388
+#: src/inc.c:433
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "������亠仆��亳��亳从舒��亳��"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "��仂仍����亠仆亳亠 仆仂于���� ��仂仂弍��亠仆亳亶"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "��亢亳亟舒仆亳亠"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "����仄亠仆亠仆舒"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "��仂仍����亠仆亳亠"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "����仗仂仍仆亠仆仂 (仗��亳仆����仂 ��仂仂弍��亠仆亳亶: %d (%s))"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "����仗仂仍仆亠仆仂 (仆亠�� 仆仂于���� ��仂仂弍��亠仆亳亶)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "����亳弍从舒 ��仂亠亟亳仆亠仆亳��"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "��亠于亠��仆��亶 仗舒��仂仍��"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "��舒仆����仂"
 
-#: src/inc.c:637
+#: src/inc.c:682
 msgid "Timeout"
 msgstr "��亠�� 仂��于亠��舒"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "��舒于亠����亠仆仂 (仆仂于���� ��仂仂弍��亠仆亳亶: %d)"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "��舒于亠����亠仆仂 (仆亠�� 仆仂于���� ��仂仂弍��亠仆亳亶)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "����亳 仗仂仍����亠仆亳亳 ��仂仂弍��亠仆亳亶 于仂亰仆亳从仍亳 仂��亳弍从亳."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "仗仂仍����亠仆亳亠 仆仂于���� ��仂仂弍��亠仆亳亶 亟仍�� ��������仆仂亶 亰舒仗亳��亳 %s...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "������亠仆��亳��亳从舒��亳��"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: ��仂仍����亠仆亳亠 仆仂于���� ��仂仂弍��亠仆亳亶"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "弌仂亠亟亳仆亠仆亳亠 �� ��亠��于亠��仂仄 POP3: %s..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "��亠 ��亟舒仍仂���� ��仂亠亟亳仆亳�������� �� ��亠��于亠��仂仄 POP3: %s:%d\n"
 
-#: src/inc.c:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "������亠仆��亳��亳从舒��亳��..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "��仂仍����亠仆亳亠 ��仂仂弍��亠仆亳亶 �� %s..."
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "��仂仍����亠仆亳亠 从仂仍亳��亠����于舒 仆仂于���� ��仂仂弍��亠仆亳亶 (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "��仂仍����亠仆亳亠 从仂仍亳��亠����于舒 仆仂于���� ��仂仂弍��亠仆亳亶 (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "��仂仍����亠仆亳亠 从仂仍亳��亠����于舒 仆仂于���� ��仂仂弍��亠仆亳亶 (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "��仂仍����亠仆亳亠 ��舒亰仄亠��舒 ��仂仂弍��亠仆亳亶 (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "丕亟舒仍亠仆亳亠 ��仂仂弍��亠仆亳�� %d"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "������仂亟"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "��仂仍����亠仆亳亠 ��仂仂弍��亠仆亳�� (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "����亳��仄 (仗��亳仆����仂 ��仂仂弍��亠仆亳亶: %d (%s))"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 msgid "Connection failed."
 msgstr "����亳弍从舒 ��仂亠亟亳仆亠仆亳��"
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "����仂亳亰仂��仍舒 仂��亳弍从舒 仗��亳 仂弍��舒弍仂��从亠 ��仂仂弍��亠仆亳亶."
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2757,28 +2757,28 @@ msgstr ""
 "����仂亳亰仂��仍舒 仂��亳弍从舒 仗��亳 仂弍��舒弍仂��从亠 ��仂仂弍��亠仆亳亶:\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "��亠�� 仄亠����舒 仆舒 亟亳��从亠."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "����亳弍从舒 亰舒仗亳��亳 于 ��舒亶仍."
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "����亳弍从舒 ��仂从亠��舒."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr "弌亠��于亠�� 亰舒从����仍 ��仂亠亟亳仆亠仆亳亠."
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "��仂����仂于��亶 ����亳从 亰舒仆����."
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2787,11 +2787,11 @@ msgstr ""
 "��仂����仂于��亶 ����亳从 亰舒仆����:\n"
 "%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 msgid "Authentication failed."
 msgstr "����亳弍从舒 舒����亠仆��亳��亳从舒��亳亳."
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2800,15 +2800,15 @@ msgstr ""
 "����亳弍从舒 舒����亠仆��亳��亳从舒��亳亳:\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr "����亠仄�� ��亠舒仆��舒 亳����亠从仍仂."
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "����亳��仄 ��仂仂弍��亠仆亳亶 仗��亠��于舒仆\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "��仂仍����亠仆亳亠 仆仂于���� ��仂仂弍��亠仆亳亶 亳亰 %s 于 %s...\n"
@@ -3687,7 +3687,7 @@ msgstr "��仂仍����亳���� ��仂仂弍��亠仆亳�� ��仂 于��亠�� ��������仆���� 亰舒仗�
 msgid "Send queued message(s)"
 msgstr "����仗��舒于亳���� ��仂仂弍��亠仆亳�� 亳亰 仂��亠��亠亟亳"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "��舒仗亳��舒����"
@@ -3728,61 +3728,61 @@ msgstr "丕亟舒仍亳���� ��仂仂弍��亠仆亳亠"
 msgid "Set as junk mail"
 msgstr "��仂仄亠��亳���� 从舒从 ��仗舒仄"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "����仗仂仍仆亳����"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "����仗仂仍仆亳���� 仂��仄亠��亠仆仆��亶 仗��仂��亠����"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "弌仍亠亟���ﾑ�亠亠 仆亠仗��仂��亳��舒仆仆仂亠 ��仂仂弍��亠仆亳亠"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "弌于仂亶����于舒"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "��弍��亳亠 仆舒������仂亶从亳"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "丕������仆舒�� 亰舒仗亳����"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "��舒������仂亶从舒 ��������仆仂亶 亰舒仗亳��亳"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "���� ��舒弍仂��舒亠��亠 于 舒于��仂仆仂仄仆仂仄 ��亠亢亳仄亠. 乂��仍从仆亳��亠 仗仂 亰仆舒��从��, ����仂弍�� 仗仂亟从仍�ﾑ�亳��������."
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr "���� 仗仂亟从仍�ﾑ�亠仆��. 乂��仍从仆亳��亠 仗仂 亰仆舒��从��, ����仂弍�� ��舒弍仂��舒���� 舒于��仂仆仂仄仆仂."
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "������仂亟"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "����亶��亳 亳亰 仗��仂亞��舒仄仄��?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 msgid "Command line options"
 msgstr "��舒��舒仄亠������ 从仂仄舒仆亟仆仂亶 ������仂从亳"
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "����仗仂仍��亰仂于舒仆亳亠: sylpheed [������������丐��]..."
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3810,7 +3810,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4031,218 +4031,223 @@ msgstr ""
 "��亠于亠��仆仂! ��仂于��仂��亳��亠...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "����从������亳亠 仂从仆舒 仆舒������仂亠从 ��������仆仂亶 亰舒仗亳��亳...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "丕������仆舒�� 亰舒仗亳���� %d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "��舒������仂亶从亳 仆仂于仂亶 ��������仆仂亶 亰舒仗亳��亳"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "��舒������仂亶从亳 ��������仆仂亶 亰舒仗亳��亳"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "弌仂亰亟舒仆亳亠 仂从仆舒 仆舒������仂亠从 ��������仆仂亶 亰舒仗亳��亳...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "����亳��仄"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "��舒��亳��舒"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "��仂仗仂仍仆亳��亠仍��仆仂"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "��仄�� ��������仆仂亶 亰舒仗亳��亳"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "��仂 ��仄仂仍��舒仆亳��"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "��亳��仆舒�� 亳仆��仂��仄舒��亳��"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "��仂仍仆仂亠 亳仄��"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "��亟��亠�� E-Mail"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "����亞舒仆亳亰舒��亳��"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "弌于亠亟亠仆亳�� 仂 ��亠��于亠��舒��"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "��仂于仂����仆仂亶 (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "��亠�� (仍仂从舒仍��仆��亶)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "亅��仂�� ��亠��于亠�� ����亠弍��亠�� 舒����亠仆��亳��亳从舒��亳亳"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "弌亠��于亠�� 仆仂于仂����亠亶"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "弌亠��于亠�� 亟仍�� 仗��亳��仄舒"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "弌亠��于亠�� SMTP (亟仍�� 仂��仗��舒于从亳)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "��仄�� 仗仂仍��亰仂于舒��亠仍��"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "��舒��仂仍��"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 msgid "Use secure authentication (APOP)"
 msgstr "����仗仂仍��亰仂于舒���� 弍亠亰仂仗舒��仆���� 舒����亠仆��亳��亳从舒��亳�� (APOP)"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "丕亟舒仍������ ��仂仂弍��亠仆亳�� �� ��亠��于亠��舒 仗仂��仍亠 仗��亳��仄舒"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "丕亟舒仍亳���� ��亠��亠亰"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "亟仆亠亶"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 msgid "0 days: remove immediately"
 msgstr "0 亟仆亠亶: ��亟舒仍亳���� 仆亠仄亠亟仍亠仆仆仂"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "����亳仆亳仄舒���� 于��亠 ��仂仂弍��亠仆亳�� �� ��亠��于亠��舒"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "����亳仆亳仄舒���� ��仂仍��从仂 ��仂仂弍��亠仆亳�� ��舒亰仄亠��仂仄 仆亠 弍仂仍亠亠"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "����"
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "个亳仍������仂于舒���� ��仂仂弍��亠仆亳�� 仗��亳 仗��亳��仄亠"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "��舒仗从舒 亟仍�� 于��仂亟����亳�� ��仂仂弍��亠仆亳亶"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "��亠仂����亳仍������仂于舒仆仆��亠 ��仂仂弍��亠仆亳�� 弍��亟���� ��仂����舒仆亠仆�� 于 ����仂亶 仗舒仗从亠."
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "��亠��仂亟 舒����亠仆��亳��亳从舒��亳亳"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "��于��仂仄舒��亳��亠��从亳"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
 msgstr "����仂于亠�������� ��仂仍��从仂 仗舒仗从�� 于��仂亟����亳�� ��仂仂弍��亠仆亳亶 (INBOX) 仗��亳 仗��亳��仄亠"
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "个亳仍������仂于舒���� ��仂仂弍��亠仆亳�� 仗��亳 仗��亳��仄亠"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "��仂于仂����亳"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 msgid "Maximum number of articles to download"
 msgstr "��舒亳弍仂仍����亠亠 ��亳��仍仂 ����舒��亠亶 亟仍�� 亰舒亞����亰从亳"
 
-#: src/prefs_account_dialog.c:1024
+#: src/prefs_account_dialog.c:1030
 msgid "No limit if 0 is specified."
 msgstr "��亠 仂亞��舒仆亳��亠仆仂, 亠��仍亳 ��从舒亰舒仆 0."
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 msgid "`Get all' checks for new messages on this account"
 msgstr "����仂于亠�������� 仗仂 从仂仄舒仆亟亠 \"��仂仍����亳���� 于��亠\""
 
-#: src/prefs_account_dialog.c:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "��舒亞仂仍仂于仂从"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "��仂弍舒于亳���� 于 亰舒亞仂仍仂于仂从 仗仂仍亠 Date"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "弌仂亰亟舒于舒���� Message-ID"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "��仂弍舒于亳���� 亟仂仗仂仍仆亳��亠仍��仆��亠 亰舒亞仂仍仂于从亳"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " ��仗��亠亟亠仍亳����... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "������亠仆��亳��亳从舒��亳��"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "������亠仆��亳��亳从舒��亳�� SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4250,197 +4255,197 @@ msgstr ""
 "����仍亳 仂����舒于亳���� ����亳 仗仂仍�� 仗��������仄亳, 弍��亟���� 亳��仗仂仍��亰仂于舒�������� 亳仄�� 仗仂仍��亰仂于舒��亠仍�� 亳 "
 "仗舒��仂仍��, 亰舒亟舒仆仆��亠 亟仍�� 仗��亳��仄舒 仗仂������."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "����仂于亠��从舒 仗舒��仂仍�� ��亠��亠亰 POP3 仗亠��亠亟 仂��仗��舒于从仂亶"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 msgid "Command output"
 msgstr "����于仂亟 从仂仄舒仆亟��"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "��于��仂仄舒��亳��亠��从亳 ������舒仆舒于仍亳于舒���� 舒亟��亠��舒"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "��仂仗亳��"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "弌从������仆仂"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "��亟��亠�� 亟仍�� 仂��于亠��仂于"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "��仂亟仗亳����于舒���� ��仂仂弍��亠仆亳�� 仗仂 ��仄仂仍��舒仆亳��"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "丿亳����仂于舒���� ��仂仂弍��亠仆亳�� 仗仂 ��仄仂仍��舒仆亳��"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr "丿亳����仂于舒���� 仂��于亠���� 仆舒 亰舒��亳����仂于舒仆仆��亠 ��仂仂弍��亠仆亳��"
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "����仗仂仍��亰仂于舒���� ASCII-从仂亟亳��仂于舒仆亳亠 仗��亳 ��亳����仂于舒仆亳亳"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "����仗仂仍��亰仂于舒���� 仂��从���������� ��亠从����仂于���� 仗仂亟仗亳����"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "��仍�ﾑ� 仗仂亟仗亳��亳"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "��仍�ﾑ� GnuPG 仗仂 ��仄仂仍��舒仆亳��"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "��仍�ﾑ� 亟仍�� 于��弍��舒仆仆仂亞仂 舒亟��亠��舒 E-mail"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "������亞仂亶 从仍�ﾑ�"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "ID 仗仂仍��亰仂于舒��亠仍�� 从仍�ﾑ�舒:"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "��亠 亳��仗仂仍��亰仂于舒���� SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "����仗仂仍��亰仂于舒���� SSL 亟仍�� ��仂亠亟亳仆亠仆亳�� POP3"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "����仗仂仍��亰仂于舒���� 从仂仄舒仆亟�� STARTTLS 亟仍�� 仆舒��舒仍舒 ��亠舒仆��舒 SSL"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "����仗仂仍��亰仂于舒���� SSL 亟仍�� ��仂亠亟亳仆亠仆亳�� IMAP4"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "����仗仂仍��亰仂于舒���� SSL 亟仍�� ��仂亠亟亳仆亠仆亳�� NNTP"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "����仗��舒于从舒 (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "����仗仂仍��亰仂于舒���� SSL 亟仍�� ��仂亠亟亳仆亠仆亳�� SMTP"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr "����仗仂仍��亰仂于舒���� 仆亠弍仍仂从亳�����ﾑ�亳亶 ��亠亢亳仄 SSL"
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "����从仍�ﾑ�亳��亠 ������ 仂仗��亳��, 亠��仍亳 于仂亰仆亳从舒�ﾑ� 仗��仂弍仍亠仄�� 仗��亳 亳��仗仂仍��亰仂于舒仆亳亳 SSL."
 
-#: src/prefs_account_dialog.c:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "��仂���� SMTP"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "��仂���� POP3"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "��仂���� IMAP4"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "��仂���� NNTP"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "��仄�� 亟仂仄亠仆舒"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "��舒��舒仍仂亞 ��亠��于亠��舒 IMAP4"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "����亟���� 仂��仂弍��舒亢亠仆�� ��仂仍��从仂 仗仂亟从舒��舒仍仂亞亳 ����仂亞仂 从舒��舒仍仂亞舒."
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 msgid "Clear all message caches on exit"
 msgstr "����亳��舒���� 从亠�� ��仂仂弍��亠仆亳亶 仗��亳 于����仂亟亠"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "弌仂����舒仆������ 仂��仗��舒于仍亠仆仆��亠 ��仂仂弍��亠仆亳�� 于"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "弌仂����舒仆������ ��亠��仆仂于亳从亳 于"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 msgid "Put queued messages in"
 msgstr "弌仂����舒仆������ ��仂仂弍��亠仆亳��, 仂亢亳亟舒�ﾑ�亳亠 仂��仗��舒于从亳, 于"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "弌仂����舒仆������ ��亟舒仍��仆仆��亠 ��仂仂弍��亠仆亳�� 于"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "��亠 ��从舒亰舒仆仂 亳仄�� ��������仆仂亶 亰舒仗亳��亳."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "��亠 ��从舒亰舒仆 舒亟��亠�� E-Mail."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "��亠 ��从舒亰舒仆 ��亠��于亠�� SMTP."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "��亠 ��从舒亰舒仆仂 亳仄�� 仗仂仍��亰仂于舒��亠仍��."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "��亠 ��从舒亰舒仆 ��亠��于亠�� POP3."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "��亠 ��从舒亰舒仆 ��亠��于亠�� IMAP4."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "��亠 ��从舒亰舒仆 ��亠��于亠�� NNTP."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr "丕从舒亰舒仆仆舒�� 仗舒仗从舒 仆亠 �磦仍�磳������ 仗舒仗从仂亶 仂��亠��亠亟亳 ��仂仂弍��亠仆亳亶."
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6674,31 +6679,31 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 msgid "Sa_ve this image as..."
 msgstr "弌仂����舒仆亳���� 亳亰仂弍��舒亢亠仆亳亠 从舒从..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "��舒仗亳��舒���� 仆仂于仂亠 ��仂仂弍��亠仆亳亠"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 msgid "Add to address _book..."
 msgstr "��仂弍舒于亳���� 于 舒亟��亠��仆���� 从仆亳亞��"
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 msgid "Copy this add_ress"
 msgstr "��仂仗亳��仂于舒���� 舒亟��亠��"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 msgid "_Open with Web browser"
 msgstr "����从�������� 于 弍��舒��亰亠��亠"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr "��仂仗亳��仂于舒���� ������仍从��"
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6711,7 +6716,7 @@ msgstr ""
 "\n"
 "������ ��舒于仆仂 仂��从��������?"
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr "��仆亳仄舒仆亳亠 - 仗仂亟仄亠仆舒 URL"
 
diff --git a/po/sk.po b/po/sk.po
index 7183dbe7..1e5ea915 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2004-01-22 17:46+0100\n"
 "Last-Translator: Andrej Kacian <andrej@kacian.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -20,196 +20,196 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Na��鱈tavam nastavenia pre v邸etky kont叩...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 spojenie k %s sa preru邸ilo. Znovu prip叩jam...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Prie��inok serveru IMAP"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "vytv叩ram IMAP4 spojenie k %s:%d ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "Ned叩 sa vytvori泥 TLS spojenie.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Odstra��ujem spr叩vu %d"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Odosielam spr叩vu (%d / %d bajtov)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Kop鱈rujem spr叩vu %s%c%d do %s ...\n"
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kop鱈rujem spr叩vu %s%c%d do %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Prij鱈mam spr叩vy z %s..."
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ned叩 sa nastavi泥 pr鱈znak zmazania: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "ned叩 sa odstr叩ni泥\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Prij鱈mam spr叩vy z %s..."
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ned叩 sa nastavi泥 pr鱈znak zmazania: 1:*\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "prie��inok sa ned叩 zatvori泥\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "kore��ov箪 prie��inok %s neexistuje\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "pri pr鱈kaze LIST sa vyskytla chyba.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Ned叩 sa vytvori泥 '%s'\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Ned叩 sa vytvori泥 '%s' v INBOXe\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ned叩 sa vytvori泥 schr叩nka: pr鱈kaz LIST zlyhal\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "ned叩 sa vytvori泥 schr叩nka\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ned叩 sa premenova泥 schr叩nka: %s na %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "schr叩nka sa ned叩 odstr叩ni泥 \n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "ob叩lka sa ned叩 na��鱈ta泥\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Odosielam spr叩vu (%d / %d bajtov)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "pri z鱈skavan鱈 ob叩lky sa vyskytla chyba.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ob叩lka sa ned叩 pre��鱈ta泥: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ned叩 sa pripoji泥 k serveru IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ned叩 sa vytvori泥 IMAP4 spojenie s: %s:%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "ned叩 sa n叩js泥 ob叩lka\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "prie��inok sa ned叩 vytvori泥: %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "chyba pri IMAP pr鱈kaze: CLOSE\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 autentiz叩cia bola ne炭spe邸n叩.\n"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "ne炭spe邸n辿 prihl叩senie k IMAP4.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ned叩 sa napoji泥 %s k %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(posielam s炭bor...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "ned叩 sa napoji泥 spr叩va k %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ned叩 sa kop鱈rova泥 %s do %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "chyba pri IMAP pr鱈kaze: STORE %s %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "chyba pri IMAP pr鱈kaze: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 msgid "error while imap command: CLOSE\n"
 msgstr "chyba pri IMAP pr鱈kaze: CLOSE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nem担転e skonvertova泥 UTF-7 na %s\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nem担転e skonvertova泥 %s na UTF-7\n"
@@ -296,25 +296,25 @@ msgstr "nem担転em skr叩ti泥 mailbox na nulov炭 d頂転ku.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportujem spr叩vy z %s do %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "nem担転em kop鱈rova泥 spr叩vu %s do %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "Nem担転em ozna��i泥 s炭bor so zna��kami.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "zdrojov箪 prie��inok je ten ist箪 ako cie直ov箪.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kop鱈rujem spr叩vu %s%c%d do %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -323,7 +323,7 @@ msgstr ""
 "S炭bor '%s' u転 existuje.\n"
 "Prie��inok sa ned叩 vytvori泥."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -335,77 +335,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "nadv辰zujem NNTP spojenie k %s:%d ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP spojenie k %s:%d bolo preru邸en辿. Obnovujem spojenie...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "��l叩nok %d u転 je v medzipam辰ti.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "prij鱈mam ��l叩nok %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "nem担転em pre��鱈ta泥 ��l叩nok %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "nem担転em odosla泥 ��l叩nok.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "nem担転em prija泥 ��l叩nok %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "nem担転em vybra泥 skupinu %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neplatn箪 rozsah ��l叩nkov: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "転iadne nov辿 ��l叩nky.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "prij鱈mam xover %d - %d v %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "nem担転em prija泥 xover\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "pri prij鱈man鱈 xover sa vyskytla chyba.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "neplatn箪 xover riadok: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "nem担転em prija泥 xhdr\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "pri prij鱈man鱈 xhdr sa vyskytla chyba.\n"
 
@@ -484,7 +484,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "vyskytla sa chyba pri POP3 spojen鱈\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "nepodarilo sa zap鱈sa泥 nastavenie do s炭boru\n"
@@ -516,12 +516,12 @@ msgstr "procmime_get_text_content(): Nepodarilo sa skonvertova泥 k坦d.\n"
 msgid "can't open mark file\n"
 msgstr "nem担転em otvori泥 s炭bor so zna��kami\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ned叩 sa prija泥 spr叩va %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Pr鱈kazov箪 riadok tla��e je neplatn箪: '%s'\n"
@@ -689,7 +689,7 @@ msgstr ""
 msgid "Name"
 msgstr "Meno"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -1158,7 +1158,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Prie��inok"
@@ -1191,7 +1191,7 @@ msgstr "Upozornenie"
 msgid "Warning"
 msgstr "Varovanie"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "Chyba"
 
@@ -1747,7 +1747,7 @@ msgstr "MIME typ"
 msgid "Size"
 msgstr "Ve直kos泥"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "Odosla泥"
@@ -1789,7 +1789,7 @@ msgid "Attach file"
 msgstr "Pripoji泥 s炭bor"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "Podpis"
@@ -2003,7 +2003,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:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "S炭bor"
 
@@ -2082,7 +2082,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2147,7 +2147,7 @@ msgstr "Timeout (v sekund叩ch)"
 msgid "Maximum Entries"
 msgstr "Maximum z叩znamov"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "Z叩kladn辿"
 
@@ -2205,7 +2205,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "Zvo直te..."
 
@@ -2361,12 +2361,12 @@ msgstr "Nastavujem inform叩cie o prie��inku...\n"
 msgid "Setting folder info..."
 msgstr "Nastavujem inform叩cie o prie��inku..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preh直ad叩vam prie��inok %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preh直ad叩vam prie��inok %s ..."
@@ -2639,7 +2639,7 @@ msgstr "Importova泥 s炭bor LDIF do adres叩ra"
 msgid "Prev"
 msgstr "Predch叩dzaj炭ci"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "Nasleduj炭ca"
 
@@ -2660,144 +2660,144 @@ msgstr "Dokon��i泥"
 msgid "Sylpheed: %d new messages"
 msgstr "Dokon��en辿 (%d nov箪ch spr叩v)"
 
-#: src/inc.c:388
+#: src/inc.c:433
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autentiz叩cia"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "Prij鱈mam nov辿 spr叩vy"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "��akajte"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "Zru邸en辿"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "Prij鱈mam"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hotovo (%d spr叩v (%s) prijat箪ch)"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "Hotovo (転iadne nov辿 spr叩vy)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "Autentiz叩cia zlyhala"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "Zamknut辿"
 
-#: src/inc.c:637
+#: src/inc.c:682
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (v sekund叩ch)"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Dokon��en辿 (%d nov箪ch spr叩v)"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "Dokon��en辿 (転iadne nov辿 spr叩vy)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "Pri prij鱈man鱈 po邸ty sa vyskytli chyby."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "prij鱈mam nov辿 spr叩vy pre konto %s...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autentiz叩cia"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prij鱈mam nov辿 spr叩vy"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Prip叩jam sa k serveru POP3: %s..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, 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:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Autentiz叩cia..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Prij鱈mam spr叩vy z %s..."
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Z鱈skavam po��et nov箪ch spr叩v (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Z鱈skavam po��et nov箪ch spr叩v (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Z鱈skavam po��et nov箪ch spr叩v (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "Z鱈skavam ve直kos泥 spr叩v (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "Odstra��ujem spr叩vu %d"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "Odp叩jam sa"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prij鱈mam spr叩vu (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Prij鱈mam (%d spr叩v (%s) prijat箪ch)"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 msgid "Connection failed."
 msgstr "Spojenie zlyhalo."
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "Pri spracov叩van鱈 po邸ty sa vyskytla chyba."
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2806,28 +2806,28 @@ msgstr ""
 "Pri spracov叩van鱈 po邸ty sa vyskytla chyba:\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "Na disku u転 nie je miesto."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "Ned叩 sa zapisova泥 do s炭boru."
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "Chyba socketu."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr "Vzdialen箪 hostite直 ukon��il spojenie."
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "Mailbox je zamknut箪."
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2836,11 +2836,11 @@ msgstr ""
 "Mailbox je zamknut箪:\n"
 "%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 msgid "Authentication failed."
 msgstr "Autentiz叩cia bola ne炭spe邸n叩."
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2849,16 +2849,16 @@ msgstr ""
 "Autentiz叩cia bola ne炭spe邸n叩:\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 #, fuzzy
 msgid "Session timed out."
 msgstr "��as spojenia vypr邸al\n"
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "Za��le��ovanie zru邸en辿\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Prij鱈mam nov辿 spr叩vy z %s do %s...\n"
@@ -3766,7 +3766,7 @@ msgstr "Prija泥 nov炭 po邸tu pre v邸etky kont叩"
 msgid "Send queued message(s)"
 msgstr "Odosla泥 spr叩vy vo fronte"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Nov叩 spr叩va"
@@ -3808,62 +3808,62 @@ msgstr "Zmaza泥 spr叩vu"
 msgid "Set as junk mail"
 msgstr "Nastavi泥 ako v箪chodzie"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "Vykona泥"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "Vykona泥 ozna��en箪 proces"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "��al邸ia nepre��鱈tan叩 spr叩va"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "Nastavenia"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "V邸eobecn辿 nastavenia"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "Nastavenie konta"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr "Ste odpojen箪. Kliknite na ikonu, ak sa chcete pripoji泥."
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr "Ste pripojen箪. Kliknite na ikonu, ak sa chcete odpoji泥."
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "Ukon��i泥"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "Ukon��i泥 program"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 #, fuzzy
 msgid "Command line options"
 msgstr "Nebol zadan箪 pr鱈kazov箪 riadok."
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Pou転itie: %s [VO捗BY]...\n"
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3879,7 +3879,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4089,226 +4089,231 @@ msgstr ""
 "Neplatn辿 heslo! Sk炭ste znova...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "Otv叩ram okno nastavenia konta...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "Nastavenie nov辿ho konta"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Nastavenie konta"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "Vytv叩ram okno nastavenia konta...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "Prija泥"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "S炭kromie"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "Roz邸鱈ren辿"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "N叩zov tohto konta"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "Nastavi泥 ako v箪chodzie"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "Osobn辿 inform叩cie"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "Cel辿 meno"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "E-mailov叩 adresa"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "Organiz叩cia"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "Inform叩cie o serveri"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "貼iadne (lok叩lne)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "Tento server vy転aduje autentiz叩ciu"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "News server"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "Server pre prij鱈manie"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "SMTP server (odosielanie)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "Prihlasovacie meno"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "Heslo"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Tento server vy転aduje autentiz叩ciu"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "Vymaza泥 spr叩vy na serveri po ich prijat鱈"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "Vymaza泥 po"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "d��och"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dn鱈: zmaza泥 ihne��)"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Prija泥 v邸etky spr叩vy na serveri"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "Obmedzenie ve直kosti spr叩vy pre pr鱈jem"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "Filtrova泥 spr叩vy pri prijat鱈"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "V箪chodz鱈 inbox"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 #, 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:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "Met坦da autentiz叩cie"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "Automatick叩"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "Len pri manu叩lnom prij鱈man鱈"
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "Filtrova泥 spr叩vy pri prijat鱈"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "Diskusn辿 skupiny"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 #, 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:1024
+#: src/prefs_account_dialog.c:1030
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Nie je ur��en箪 pr鱈jemca."
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 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:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Hlavi��ka"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "Prida泥 d叩tum do hlavi��ky"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "Generova泥 Message-ID"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "Prida泥 u転ivate直om definovan辿 hlavi��ky"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " Upresni泥... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "Autentiz叩cia"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Autentiz叩cia (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4317,200 +4322,200 @@ msgstr ""
 "Ak nech叩te tieto polia pr叩zdne, bude pou転it辿 to ist辿\n"
 "prihlasovacie meno a heslo ako pri prij鱈man鱈."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentizova泥 cez POP3 pred odosielan鱈m"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 msgid "Command output"
 msgstr "V箪stup pr鱈kazu"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastavi泥 nasleduj炭ce adresy"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "K坦pia"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Slep叩 k坦pia"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "Odpoveda泥 komu"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "Implicitne podp鱈sa泥 spr叩vu"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "Implicitne za邸ifrova泥 spr叩vu"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "��ifrova泥 do ASCII-armored tvaru"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "Podp鱈sa泥 ��ist箪m textom"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "K直炭�� pre podpis"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "Pou転i泥 v箪chodz鱈 k直炭�� GnuPG"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "Zvoli泥 k直炭�� pod直a va邸ej emailovej adresy"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "Zada泥 k直炭�� ru��ne"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "User alebo key ID:"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "Nepou転鱈va泥 SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "Pou転i泥 SSL pre POP3 spojenie"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Pou転i泥 pr鱈kaz STARTTLS pre nadviazanie SSL spojenia"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "Pou転i泥 SSL pre IMAP4 spojenie"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "Pou転i泥 SSL pre NNTP spojenie"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "Odosla泥 (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "Pou転i泥 SSL pre SMTP spojenie"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr "Pou転鱈va泥 non-blocking SSL"
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 #, 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:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "Ur��i泥 SMTP port"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "Ur��i泥 POP3 port"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "Ur��i泥 IMAP4 port"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "Ur��i泥 NNTP port"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "Ur��i泥 n叩zov dom辿ny"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "Prie��inok serveru IMAP"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Prija泥 v邸etky spr叩vy na serveri"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "Ulo転i泥 odoslan辿 spr叩vy do"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "Ulo転i泥 koncepty do"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Ulo転i泥 vymazan辿 spr叩vy do"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "Ulo転i泥 vymazan辿 spr叩vy do"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "Nebol zadan箪 n叩zov konta."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "Nebola zadan叩 e-mailov叩 adresa."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "Nebol zadan箪 SMTP server."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "Nebol zadan箪 user ID."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "Nebol zadan箪 POP3 server."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "Nebol zadan箪 IMAP4 server."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "Nebol zadan箪 NNTP server."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6817,36 +6822,36 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Ulo転i泥 ako..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Nap鱈sa泥 nov炭 spr叩vu"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Prida泥 odosielate直a do _adres叩ra"
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Spolo��n叩 adresa"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Webov箪 prehliada��"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6855,7 +6860,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/sl.po b/po/sl.po
index 06f3bf80..41de7efc 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2003-01-24 20:39CET\n"
 "Last-Translator: Jernej Kovacic <jkovacic@email.si>\n"
 "Language-Team: Slovenian <translator-team-sl@lists.sourceforge.net>\n"
@@ -18,201 +18,201 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Berem vse nastavitve za vsak ra��un...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Povezava IMAP4 do %s%d se je prekinila. Povezujem se znova...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Imenik stre転nika IMAP"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "delam povezavo IMAP4 do %s:%d ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "Ne morem pri��eti seje TLS.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Bri邸em sporo��ilo %d"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Po邸iljam sporo��ilo (%d / %d zlogov)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Prestavljam sporo��ilo %s%c%d v %s ...\n"
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiram sporo��ilo %s%c%d v %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Sprejemam sporo��ila iz %s v %s...\n"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ne morem nastaviti izbrisanih zastavic: %d\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "ne morem izbrisati\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Sprejemam sporo��ila iz %s v %s...\n"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ne morem nastaviti izbrisanih zastavic: 1:%d\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ne morem izbrati mape: %s\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Datoteka z oznakami ni bila najdena.\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "med dobivanjem LIST je pri邸lo do napake.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Ne morem narediti '%s'\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Ne morem narediti '%s' pod mapo Prejeto\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ne morem narediti po邸tnega predala: LIST ni uspel\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "ne morem narediti po邸tnega predala\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ne morem preimenovati po邸tnega predala: %s v %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "ne morem izbrisati po邸tnega predala\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "ne morem dobiti ovojnice\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Po邸iljam sporo��ilo (%d / %d zlogov)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "med dobivanjem ovojnice je pri邸lo do napake.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ne morem raz��leniti ovojnice: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ne morem se povezati s stre転nikom IMAP4: %s%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ne morem vzpostaviti seje IMAP4 z: %s%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "ne morem dobiti imenskega prostora\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne morem izbrati mape: %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Overovitvena metoda"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "Prijava na IMAP4 ni uspela.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne morem pripeti %s na %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(po邸iljam datoteko...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne morem dodati sporo��ila %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne morem kopirati %d na %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "napaka med IMAPovim ukazom: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne more pretvoriti UTF-7 v %s\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne more pretvoriti %s v UTF-7\n"
@@ -299,25 +299,25 @@ msgstr "ne morem prisekati po邸tnega predala na ni��lo.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Izva転am sporo��ila iz %s v %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ne morem prepisati sporo��ila %s v %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "Ne morem odpreti ozna��ene datoteke.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "Izvorna mapa je identi��na ciljni.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopiram sporo��ilo %s%c%d v %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -326,7 +326,7 @@ msgstr ""
 "Datoteka `%s' 転e obstaja.\n"
 "Ne morem narediti imenika."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -338,77 +338,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "ustvarjam povezavo NNTP do %s:%d ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "Povezava NNTP do %s:%d je bila prekinjena. Povezujem se znova...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "��lanek %d je 転e v predpomnilniku.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "sprejemam ��lanek %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "ne morem prebrati ��lanka %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "ne morem poslati ��lanka.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "ne morem sprejeti ��lanka %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "ne morem izbrati skupine %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neveljavno obmo��je ��lankov: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "ni novih ��lankov.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "sprejemam xover %d - %d v %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "ne morem prejeti xoverja\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "med prejemanjem xoverja je pri邸lo do napake.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "neveljavna vrstica xover: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "ne morem prejeti xhdr-ja\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "med prejemanjem xhdr-ja je pri邸lo do napake.\n"
 
@@ -489,7 +489,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "Med preverjanjem istovetnosti je pri邸lo do napake\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "neuspe邸en poskus zapisa konfiguracije v datoteko\n"
@@ -521,12 +521,12 @@ msgstr "procmime_get_text_content(): Pretvorba kodiranja ni uspela.\n"
 msgid "can't open mark file\n"
 msgstr "Ne morem odpreti datoteke z oznakami.\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ne morem prenesti sporo��ila %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za tiskanje ni veljavna: `%s'\n"
@@ -697,7 +697,7 @@ msgstr ""
 msgid "Name"
 msgstr "Ime"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -1163,7 +1163,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Mapa"
@@ -1196,7 +1196,7 @@ msgstr "Opomba"
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "Napaka"
 
@@ -1752,7 +1752,7 @@ msgstr "Tip MIME"
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "Po邸lji"
@@ -1794,7 +1794,7 @@ msgid "Attach file"
 msgstr "Pripni datoteko"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "Podpis"
@@ -2009,7 +2009,7 @@ msgid " Check File "
 msgstr " Preveri Datoteko "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "Datoteka"
 
@@ -2087,7 +2087,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2152,7 +2152,7 @@ msgstr "��as izteka (sek.)"
 msgid "Maximum Entries"
 msgstr "Najve��je 邸t. vnosov"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "Osnovno"
 
@@ -2209,7 +2209,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Izberi... "
 
@@ -2365,12 +2365,12 @@ msgstr "Nastavljam informacije o mapi...\n"
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
@@ -2644,7 +2644,7 @@ msgstr "Uvozi datoteko LDIF v imenik naslovov"
 msgid "Prev"
 msgstr "Prej邸nji"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "Naslednji"
 
@@ -2665,200 +2665,200 @@ msgstr "Kon��aj"
 msgid "Sylpheed: %d new messages"
 msgstr "Kon��ano (%d novih sporo��il)"
 
-#: src/inc.c:388
+#: src/inc.c:433
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Overovljam"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "Prena邸am nova sporo��ila"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "V pripravljenosti"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "Preklicano"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "Prena邸am"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Opravljeno (%d sporo��il (%s) prejetih)"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "Opravljeno (ni novih sporo��il)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "Overovitev ni uspela"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "Zaklenjeno"
 
-#: src/inc.c:637
+#: src/inc.c:682
 #, fuzzy
 msgid "Timeout"
 msgstr "��as izteka (sek.)"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Kon��ano (%d novih sporo��il)"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "Kon��ano (ni novih sporo��il)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "Med prejemanjem po邸te je pri邸lo do nekaterih napak."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "sprejemam nova sporo��ila z ra��una %s...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Overovljam"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prena邸am nova sporo��ila"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se s stre転nikom POP: %s"
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, 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:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Overovljam..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Sprejemam sporo��ila iz %s v %s...\n"
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Ugotavljam 邸tevilo novih sporo��il (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Ugotavljam 邸tevilo novih sporo��il (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Ugotavljam 邸tevilo novih sporo��il (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "Ugotavljam velikost sporo��il (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "Bri邸em sporo��ilo %d"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "Zapu邸��am"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prena邸am sporo��ilo (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Opravljeno (%d sporo��il (%s) prejetih)"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 #, fuzzy
 msgid "Connection failed."
 msgstr "Povezava ni uspela"
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "Med obdelavo po邸te je pri邸lo do napake."
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Med obdelavo po邸te je pri邸lo do napake."
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "Na disku ni prostora."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "Ne morem napisati datoteke."
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "napaka v priklju��ku."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "Po邸tni predal je zaklenjen."
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Po邸tni predal je zaklenjen."
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "Pripojitev odpovedana\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Pobiram nova sporo��ila iz %s v %s...\n"
@@ -3770,7 +3770,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:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Sestavi"
@@ -3812,62 +3812,62 @@ msgstr "Izbri邸i sporo��ilo"
 msgid "Set as junk mail"
 msgstr "Nastavi kot privzeto"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "Izvedi"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "Izvedi ozna��en proces"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "Naslednje neprebrano sporo��ilo"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "Nastavitve"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "Splo邸ne preference"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Ra��un"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "Nastavitev ra��una"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "Kon��aj"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "Ali naj kon��am ta program?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 #, fuzzy
 msgid "Command line options"
 msgstr "Ukazna vrstica ni nastavljena."
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uporaba: %s [MO貼NOST]...\n"
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3883,7 +3883,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4093,225 +4093,230 @@ msgstr ""
 "Napa��na 邸ifrirna fraza! Poskusite znova...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "Odpiram okno za nastavitve ra��una...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "Ra��un%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "Nastavitve novega ra��una"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Nastavitve ra��una"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "Ustvarjam okno za nastavitve ra��una...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "Sprejmi"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "Zasebnost"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "Ime tega ra��una"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "Nastavi kot privzeto"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "Osebni podatki"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "Polno ime"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "Po邸tni naslov"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "Organizacija"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "Podatki o stre転niku"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "Novice (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "Noben (lokalen)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "Ta stre転nik zahteva overovitev"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "Novi��arski stre転nik"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "Stre転nik za sprejemanje"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "Stre転nik SMTP (po邸iljanje)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "Uporabni邸ko ime"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "Geslo"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Ta stre転nik zahteva overovitev"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "Ob sprejemu odstrani sporo��ila s stre転nika"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "Odstrani po"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "dneh"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dnevih: odstrani nemudoma)"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Nalo転i vsa sporo��ila na stre転niku"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "Omejitev dol転ine pri sprejemanju"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "Filtriranje sporo��il ob sprejemu"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "Privzeta mapa za prejeto po邸to"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nefiltrirana sporo��ila bodo shranjena v tej mapi)"
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "Overovitvena metoda"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "Filtriranje sporo��il ob sprejemu"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "Novice"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 #, 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:1024
+#: src/prefs_account_dialog.c:1030
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Naslovnik ni dolo��en."
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 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:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Zaglavje"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "Dodaj polje z datumom v zaglavje"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "Generiran ID sporo��ila"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "Dodaj uporabni邸ko definirano zaglavje"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " Uredi... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "Overovitev"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Avtentikacija SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4320,200 +4325,200 @@ msgstr ""
 "��e pustite te vnose prazne, bosta uporabljena\n"
 "isti uporabn邸ki ID in geslo kot pri sprejemu."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "Pred po邸iljanjem avtenticiraj s POP3"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 #, fuzzy
 msgid "Command output"
 msgstr "Ukaz"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Samodejno nastavi slede��e naslove"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "Kp:"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Skp:"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "Odgovor za"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "Privzeto podpi邸i sporo��ilo"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "privzeto zakodiraj sporo��io"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "Uporabi oklopljen zapis ASCII za enkripcijo"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "Uporabi jasen tekstovni podpis"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "Klju�� za podpisovanje"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "Uporabi privzet klju�� GnuPG"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "Izberi klju�� glede na va邸 el. naslov"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "Ro��no dolo��i klju��"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "Uporabnik ali ID klju��a"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "Ne uporabljaj SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "Uporabi SSL za povezavo POP3"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Uporabi ukaz STARTTLS za pri��etek seje SSL"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "Uporabi SSL za povezavo IMAP4"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "Uporabi SSL za povezavo NNTP"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "Po邸lji (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "Uporabi SSL za povezavo SMTP"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "Vnesite vrata SMTP"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "Vnesite vrata POP3"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "Vnesite vrata IMAP4"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "Vnesite vrata NNTP"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "Vnesite ime domene"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "Imenik stre転nika IMAP"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Nalo転i vsa sporo��ila na stre転niku"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "Postavi poslana sporo��ila v"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "Postavi osnutke sporo��il v"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Postavi izbrisana sporo��ila v"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "Postavi izbrisana sporo��ila v"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "Ime ra��una ni vne邸eno."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "Elektronski naslov ni naveden."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "Stre転nik SMTP ni naveden."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "Uporabnikov ID ni vne邸en."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "Stre転nik POP3 ni vne邸en."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "Stre転nik IMAP4 ni naveden."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "Stre転nik NNTP ni naveden."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6821,36 +6826,36 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Shrani kot..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Sestavi novo sporo��ilo"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Doda_j po邸iljatelja v adresar"
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Skupni naslov"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Spletni brskalnik"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6859,7 +6864,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index 6906a29f..c95f88d0 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -19,201 +19,201 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "��itanje konfiguracije za svaki nalog...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 veza prema %s:%d je pukla. Povezujem se ponovo...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Direktorijum IMAP servera"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "ostvarujem IMAP4 vezu prema %s:%d ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "Ne mogu pokrenuti TLS sesiju.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Bri邸em poruke %d"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "��aljem poruku (%d / %d bajtova)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Pomeram poruke %s%c%d u %s ...\n"
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ne mogu postaviti obrisane oznake: %d\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "ne mogu obrisati\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ne mogu postaviti obrisane oznake: 1:%d\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ne mogu odabrati direktorijum: %s\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Ozna��ena datoteka ne postoji.\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "do邸lo je do gre邸ke prilikom dohvatanja LISTe.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "ne mogu kreirati '%s'\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "ne mogu kreirati '%s' ispod INBOX\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ne mogu kreirati sandu��e: LIST nije uspeo\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "ne mogu kreirati sandu��e\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ne mogu promeniti ime sandu��eta %s u %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "ne mogu obrisati sandu��e\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "ne mogu dobiti omot\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "��aljem poruku (%d / %d bajtova)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "do邸lo je do gre邸ke prilikom dobijanja omota.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ne mogu analizirati omot: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ne mogu se povezati sa IMAP4 serverom: %s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ne mogu se povezati s IMAP4 serverom: %s:%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "ne mogu dobiti namespace\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne mogu odabrati direktorijum: %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "gre邸ka prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Na��in provere identieta"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login nije uspeo.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne mogu dodati %s na %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(邸aljem datoteku...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne mogu dodati poruku %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne mogu kopirati %d u %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "gre��ka prilikom imap naredbe: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "gre邸ka prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "gre邸ka prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne mo転e prebaciti UTF-7 to %s\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne mo転e prebaciti %s to UTF-7\n"
@@ -300,25 +300,25 @@ msgstr "ne mogu skratiti sandu��e na nulu.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Izvozim poruke iz %s u %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ne mogu kopirati poruku %s u %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "Ne mogu otvoriti ozna��enu datoteku.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "izvorni direktorijum jednak je destinaciji.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -327,7 +327,7 @@ msgstr ""
 "Datoteka `%s' ve�� postoji.\n"
 "Ne mogu napraviti direktorijum."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -339,77 +339,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "uspostavljam NNTP vezu sa %s:%d ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP veza sa %s:%d je prekinuta. Povezujem se ponovo...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "��lanak %d ve�� je pohranjen.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "primam ��lanak %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "ne mogu pro��itati ��lanak %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "ne mogu poslati ��lanak.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "ne mogu primiti ��lanak %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "ne mogu odabrati grupu %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "pogre邸an opseg ��lanaka: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "nema novih ��lanaka.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "primam xover %d - %d u %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "ne mogu primiti xover\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "do邸lo je do gre邸ke prilikom primanja xovera.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "pogre邸na xover linija: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "ne mogu dobiti xhdr\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "do邸lo je do gre邸ke prilikom primanja xhdra.\n"
 
@@ -490,7 +490,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "gre邸ka prilikom provere identiteta\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "neuspeh pri pisanju konfiguracije u datoteku\n"
@@ -522,12 +522,12 @@ msgstr "procmime_get_text_content(): Promena koda nije uspjela.\n"
 msgid "can't open mark file\n"
 msgstr "ne mogu otvoriti obele転enu datoteku\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ne mogu dohvatiti poruku %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Naredba za 邸tampanje nije dobra: `%s'\n"
@@ -697,7 +697,7 @@ msgstr ""
 msgid "Name"
 msgstr "Ime"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -1157,7 +1157,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Direktorijum"
@@ -1190,7 +1190,7 @@ msgstr "Obave邸tenje"
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "Gre邸ka"
 
@@ -1747,7 +1747,7 @@ msgstr "MIME tip"
 msgid "Size"
 msgstr "Veli��ina"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "Po邸alji"
@@ -1789,7 +1789,7 @@ msgid "Attach file"
 msgstr "Prika��i datoteku"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "Potpis"
@@ -2004,7 +2004,7 @@ msgid " Check File "
 msgstr " Proveri datoteku "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "Datoteka"
 
@@ -2082,7 +2082,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2147,7 +2147,7 @@ msgstr "Timeout (sek)"
 msgid "Maximum Entries"
 msgstr "Max. Unos"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "Osnovno"
 
@@ -2204,7 +2204,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Odaberite... "
 
@@ -2360,12 +2360,12 @@ msgstr "Postavljam info direktorijuma...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretra転ujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretra転ujem direktorijum %s ..."
@@ -2639,7 +2639,7 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Prev"
 msgstr "Preth."
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "Sled."
 
@@ -2660,200 +2660,200 @@ msgstr "Gotovo"
 msgid "Sylpheed: %d new messages"
 msgstr "Zavr邸eno (%d novih poruka)"
 
-#: src/inc.c:388
+#: src/inc.c:433
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Provera identiteta"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "Primam nove poruke"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "Standby"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "Primam"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Gotovo (%d poruke/a (%s) primljeno)"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "Nema nepro��itanih poruka"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "Veza nije ostvarena"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "Identifikacija nije uspela"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "Zaklju��ano"
 
-#: src/inc.c:637
+#: src/inc.c:682
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Zavr邸eno (%d novih poruka)"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "Nema nepro��itanih poruka"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "Do邸lo je do gre邸aka prilikom primanja po邸te."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "primam nove poruke za nalog %s...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Provera identiteta"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Primam nove poruke"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se na POP3 server: %s ..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, 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:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Preuzimam broj novih poruka (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Preuzimam broj novih poruka (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Preuzimam broj novih poruka (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "Preuzimam veli��inu poruka (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "Bri邸em poruke %d"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "Izlazim"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Gotovo (%d poruke/a (%s) primljeno)"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 #, fuzzy
 msgid "Connection failed."
 msgstr "Veza nije ostvarena"
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "Do邸lo je do gre邸ke pri radu s po邸tom."
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, 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:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "Nema vi邸e mesta na disku."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "Ne mogu pisati u datoteku."
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "Protokol gre邸ka."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "Sandu��e je zaklju��ano."
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Sandu��e je zaklju��ano."
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Na��in provere identieta"
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Na��in provere identieta"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "Incorporation otkazano\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Primam nove poruke od %s u %s...\n"
@@ -3766,7 +3766,7 @@ msgstr "Prima novu po邸tu sa svih naloga"
 msgid "Send queued message(s)"
 msgstr "��alje odlo転ene poruku/e"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Napi邸i"
@@ -3808,62 +3808,62 @@ msgstr "Obri邸i poruku"
 msgid "Set as junk mail"
 msgstr "Postavi kao uobi��ajeni"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "Izvr邸i"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "Izvr邸i ozna��ene procese"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "Slede��a nepro��itana poruka"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "Svojstva"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "Uobi��ajena svojstva"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Nalog"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "Pode邸avanja naloga"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 #, fuzzy
 msgid "Command line options"
 msgstr "Linija za neredbe nije pode邸ena."
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3879,7 +3879,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4089,225 +4089,230 @@ msgstr ""
 "Pogre邸na lozinka! Poku邸ajte ponovo...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "Otvaram prozor za svojstva naloga...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "Nalog%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "Pode邸avanja za novi nalog"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Pode邸avanje naloga"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "Stvaranje prozora za pode邸avanje naloga...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "Primanje"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "Privatnost"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "Ime ovog naloga"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "Postavi kao uobi��ajeni"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "Li��ne informacije"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "Puno ime"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "Adresa e-po邸te"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "Organizacija"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "Informacije o serveru"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "Ni邸ta (lokalno)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "Ovaj server zahteva proveru identiteta"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "News server"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "Server za primanje"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "SMTP server (slanje)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "ID korisnika"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "Lozinka"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Ovaj server zahteva proveru identiteta"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "Ukloni poruke sa servera nakon primanja"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "Ukloni posle"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "dana"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dana: odmah ukloni)"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Preuzmi sve poruke sa servera"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "Ograni��enje u veli��ini za primanje"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "Filtriraj poruke pri primanju"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "Uobi��ajeno sandu��e"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nefiltrirane poruke biti ��e stavljene u ovaj direktorijum)"
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "Na��in provere identieta"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "Automatski"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "Filtriraj poruke pri primanju"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 #, 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:1024
+#: src/prefs_account_dialog.c:1030
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Primalac nije upisan."
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Primi sve' proverava poruke za ovaj nalog"
 
-#: src/prefs_account_dialog.c:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Zaglavlje"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "Dodaj polje Datum u zaglavlje"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "Generi邸i ID poruke"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "Dodaj zaglavlje korisnika"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " Izmeni... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "Provera identiteta"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP identifikacija (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4316,200 +4321,200 @@ msgstr ""
 "Ako ostavi邸 ove unose prazne, isti\n"
 "koririsni��ki ID i lozinka ��e biti kori邸��eni."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "Proveri identitet sa POP3 pre slanja"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 #, fuzzy
 msgid "Command output"
 msgstr "Naredba"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Automatski postavi slede��e adrese"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "Odvovori-Na"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "Uvek potpi邸i poruke"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "Uvek 邸ifruj poruke"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "Koristi ASCII-armored format za 邸ifrovanje"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "Koristi prazan tekst za potpis"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "Klju�� potpisa"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "Koristi uobi��ajeni GnuPG klju��"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "Odaberi klju�� po adresi e-po邸te"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "Navedi neki drugi klju��"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "ID klju��a ili korisnika:"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "Ne koristi SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "Koristi SSL za POP3 veze"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Korsiti STARTTLS naredbu za pokretanje SSL-a"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "Koristi SSL za IMAP4 veze"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "Koristi SSL za NNTP veze"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "Slanje (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "Koristi SSL za SMTP veze"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "Navedi SMTP port"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "Navedi POP3 port"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "Navedi IMAP4 port"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "Navedi NNTP port"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "Navedi ime domena"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "Direktorijum IMAP servera"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Preuzmi sve poruke sa servera"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "Stavi poslate poruke u"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "Stavi nedovr邸ene poruke u"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Stavi obrisane poruke u"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "Stavi obrisane poruke u"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "Ime naloga nije upisano."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "Adresa e-po邸te nije upisana."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "SMTP server nije upisan."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "ID korisnika nije upisan."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "POP3 server nije upisan."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 server nije upisan."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "NNTP server nije upisan."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6819,36 +6824,36 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/S_a��uvaj kao"
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Napi邸i novu poruku"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Dod_aj po邸iljaoca u adresar"
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Uobi��ajene adrese"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Web ��ita��"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6857,7 +6862,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index e5b48caf..2f03e7b3 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Roger Lindmark <roger.lindmark@bredband.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -19,194 +19,194 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "L辰ser all konfiguration f旦r varje konto...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-f旦rbindelse till %s har avbrutits. ��teruppkopplar...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP-server st辰nger av LOGIN.\n"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "skapar IMAP4-f旦rbindelse till %s:%d...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "Kan inte starta TLS-session.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, c-format
 msgid "Getting message %d"
 msgstr "H辰mtar meddelande %d"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "L辰gger till meddelande till %s (%d / %d)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Flyttar meddelande %s till %s..."
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopierar meddelanden %s till %s..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "Tar bort meddelanden %s"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kan inte s辰tta borttaget-flaggor: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "kan inte utpl奪na\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Tar bort alla meddelanden i %s"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kan inte s辰tta borttaget-flaggor: 1:*\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "kan inte st辰nga mapp\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "rotmapp %s finns inte\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "fel uppstod vid h辰mtning av LIST.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Kan inte skapa \"%s\"\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "kan inte skapa \"%s\" under INBOX\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan inte skapa brevl奪da: LIST misslyckades\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "kan inte skapa brevl奪da\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan inte byta namn p奪 brevl奪da %s till %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "kan inte ta bort brevl奪da\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "kan inte h辰mta kuvert\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "H辰mtar meddelandehuvuden (%d / %d)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "fel uppstod vid h辰mtning av kuvert.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kan inte tolka kuvert: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Kan inte ansluta till IMAP4-server: %s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Kan inte skapa IMAP4-session med: %s:%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "kan inte h辰mta namnutrymme\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan inte v辰lja mapp: %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 msgid "error on imap command: STATUS\n"
 msgstr "fel vid imapkommando: STATUS\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4-autentisering misslyckades.\n"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-inloggning misslyckades.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan inte l辰gga till %s till %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(skickar fil...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kan inte l辰gga till meddelande till %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan inte kopiera %s till %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "fel vid imapkommando: STORE %s %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "fel vid imapkommando: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 msgid "error while imap command: CLOSE\n"
 msgstr "fel vid imapkommando: CLOSE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan inte konvertera UTF-7 till %s\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan inte konvertera %s till UTF-7\n"
@@ -293,25 +293,25 @@ msgstr "kan inte korta av brevl奪da till noll.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exporterar meddelanden fr奪n %s till %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "kan inte kopiera meddelande %s till %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "Kan inte 旦ppna markeringsfil.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "ursprungsmappen 辰r identisk med dest.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopierar meddelande %s%c%d till %s...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -320,7 +320,7 @@ msgstr ""
 "Filen \"%s\" finns redan.\n"
 "Kan inte skapa mapp."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -339,77 +339,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "skapar NNTP-f旦rbindelse till %s:%d ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP-f旦rbindelse till %s:%d har avbrutits. ��teruppkopplar...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "inl辰gget %d har redan cachats.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "h辰mtar inl辰gg %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "kan inte l辰sa inl辰gg %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "kan inte posta inl辰gg.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "kan inte h辰mta inl辰gg %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "kan inte v辰lja grupp %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "felaktigt inl辰ggsomf奪ng: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "inga nya inl辰gg.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "h辰mtar xover %d - %d i %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "kan inte h辰mta xover\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "fel uppstod vid h辰mtning av xover.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "felaktig xover-rad: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "kan inte h辰mta xhdr\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "fel uppstod vid h辰mtning av xhdr.\n"
 
@@ -487,7 +487,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "fel uppstod vid POP3-session\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "misslyckades skriva konfiguration till fil\n"
@@ -518,12 +518,12 @@ msgstr "procmime_get_text_content(): Kodkonvertering misslyckades.\n"
 msgid "can't open mark file\n"
 msgstr "kan inte 旦ppna markeringsfil\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kan inte h辰mta meddelande %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Utskriftskommando 辰r felaktigt: \"%s\"\n"
@@ -694,7 +694,7 @@ msgstr ""
 msgid "Name"
 msgstr "Namn"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -1154,7 +1154,7 @@ msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Mapp"
@@ -1187,7 +1187,7 @@ msgstr "Notera"
 msgid "Warning"
 msgstr "Varning"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "Fel"
 
@@ -1712,7 +1712,7 @@ msgstr "MIME-typ"
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "Skicka"
@@ -1754,7 +1754,7 @@ msgid "Attach file"
 msgstr "Bifoga fil"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "Signatur"
@@ -1963,7 +1963,7 @@ msgid " Check File "
 msgstr " Kontrollera fil "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "Fil"
 
@@ -2041,7 +2041,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2106,7 +2106,7 @@ msgstr "V辰ntetid (sek)"
 msgid "Maximum Entries"
 msgstr "Maximalt antal poster"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "Grundl辰ggande"
 
@@ -2163,7 +2163,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " V辰lj... "
 
@@ -2315,12 +2315,12 @@ msgstr "St辰ller in mappinfo...\n"
 msgid "Setting folder info..."
 msgstr "St辰ller in mappinfo..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "S旦ker igenom mapp %s%c%s..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "S旦ker igenom mapp %s ..."
@@ -2594,7 +2594,7 @@ msgstr "Importera LDIF-fil till adressboken"
 msgid "Prev"
 msgstr "F旦reg奪ende"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "N辰sta"
 
@@ -2615,143 +2615,143 @@ msgstr "Avsluta"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nya meddelanden"
 
-#: src/inc.c:388
+#: src/inc.c:433
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autentiserar"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "H辰mtar nya meddelanden"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "V辰nta"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "H辰mtar"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "F辰rdig (%d meddelande(n) (%s) mottagna)"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "F辰rdig (inga nya meddelanden)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "F旦rbindelse misslyckades"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "Autentisering misslyckades"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "L奪st"
 
-#: src/inc.c:637
+#: src/inc.c:682
 msgid "Timeout"
 msgstr "Slut p奪 v辰ntetid"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Avslutad (%d nya meddelanden)"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "Avslutad (inga nya meddelanden)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "Fel uppstod vid h辰mtning av post."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "h辰mtar nya meddelanden fr奪n kontot %s...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autentiserar"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: H辰mtar nya meddelanden"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Ansluter till POP3-server: %s ..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, 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:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Autentiserar..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "H辰mtar meddelanden fr奪n %s..."
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Tar emot meddelandenas antal (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Tar emot meddelandenas antal (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Tar emot meddelandenas antal (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "Tar emot meddelandenas storlek (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "Tar bort meddelande %d"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "Avslutar"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Tar emot meddelande (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "H辰mtar (%d meddelande(n) (%s) mottagna)"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 msgid "Connection failed."
 msgstr "F旦rbindelse misslyckades."
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "Fel uppstod n辰r e-posten behandlades."
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2760,28 +2760,28 @@ msgstr ""
 "Fel uppstod n辰r e-posten behandlades:\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "Inget diskutrymme kvar."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "Kan inte skriva fil."
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "Fel p奪 uttag (socket)."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr "Anslutningen st辰ngdes av fj辰rrv辰rden."
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "Brevl奪dan 辰r l奪st."
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2790,11 +2790,11 @@ msgstr ""
 "Brevl奪dan 辰r l奪st:\n"
 "%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 msgid "Authentication failed."
 msgstr "Autentisering misslyckades."
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2803,15 +2803,15 @@ msgstr ""
 "Autentisering misslyckades:\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr "Sessionens v辰ntetid tog slut."
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "Inkorporering avbruten\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "H辰mtar nya meddelanden fr奪n %s till %s...\n"
@@ -3696,7 +3696,7 @@ msgstr "H辰mta ny post fr奪n alla konton"
 msgid "Send queued message(s)"
 msgstr "Skicka k旦ade meddelanden"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Skriv"
@@ -3737,62 +3737,62 @@ msgstr "Ta bort meddelandet"
 msgid "Set as junk mail"
 msgstr "S辰tt som skr辰ppost"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "Utf旦r k旦ade 奪tg辰rder"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "K旦r markerad process"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "N辰sta ol辰sta meddelande"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "Inst."
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "Allm辰nna inst辰llningar"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "Kontoinst辰llningar"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr "Du 辰r fr奪nkopplad. Klicka p奪 ikonen f旦r att ansluta."
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr "Du 辰r ansluten. Klicka p奪 ikonen f旦r att koppla fr奪n."
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "Avsluta detta program?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 #, fuzzy
 msgid "Command line options"
 msgstr "Kommandorad saknas."
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Anv辰ndning: %s [FLAGGOR]...\n"
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3808,7 +3808,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4017,220 +4017,225 @@ msgstr ""
 "Fel l旦senfras! F旦rs旦k igen...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "��ppnar f旦nster f旦r kontoinst辰llningar...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "Inst辰llningar f旦r nytt konto"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Kontoinst辰llningar"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "Skapar f旦nster f旦r kontoinst辰llningar...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "Ta emot"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "Integritet"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "Detta kontos namn"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "Anv辰nd som f旦rvalt konto"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "Personlig information"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "Fullst. namn"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "E-postadress"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "Serverinformation"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "Diskussionsgrupper (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "Inget (lokalt)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "Denna server kr辰ver autentisering"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "Diskussionsgruppsserver"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "Server f旦r mottagning"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "Server att skicka med (SMTP)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "Anv辰ndar-ID"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "L旦senord"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 msgid "Use secure authentication (APOP)"
 msgstr "Anv辰nd s辰ker autentisering (APOP)"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "Ta bort meddelanden p奪 server n辰r de mottagits"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "Ta bort efter"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "dagar"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dagar: ta bort direkt)"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "H辰mta alla meddelanden fr奪n server"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "Gr辰ns f旦r mottagningsstorlek"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "Filtrera meddelanden vid mottagning"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "F旦rvald inkorg"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Ofiltrerade meddelanden kommer att lagras i denna mapp"
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "Autentiseringsmetod"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "Bara vid manuell mottagning"
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "Filtrera meddelanden vid mottagning"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "Diskussionsgrupper"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 msgid "Maximum number of articles to download"
 msgstr "Maximalt antal inl辰gg att h辰mta"
 
-#: src/prefs_account_dialog.c:1024
+#: src/prefs_account_dialog.c:1030
 msgid "No limit if 0 is specified."
 msgstr "Ingen begr辰nsning om 0 辰r angivet."
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 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:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Brevhuvud"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "L辰gg till datumf辰lt i brevhuvud"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "Skapa Meddelande-ID"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "L辰gg till anv辰ndardefinierat brevhuvud"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr "Redigera..."
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-Autentisering (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4238,199 +4243,199 @@ msgstr ""
 "Om du l辰mnar dessa poster tomma, kommer samma anv辰ndar-ID och l旦senord som "
 "vid h辰mtning att anv辰ndas."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentisera med POP3 innan brev skickas"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 msgid "Command output"
 msgstr "Kommandoutdata"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "S辰tt automatiskt f旦ljande adresser"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "Kopia"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Dold kopia"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "Svara till"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "Signera alla meddelanden"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "Kryptera alla meddelanden"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr "Kryptera vid svar p奪 krypterat meddelande"
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "Anv辰nd ASCII-pansar f旦r kryptering"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "Anv辰nd klartextsignatur"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "Signaturnyckel"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "Anv辰nd f旦rvald GnuPG-nyckel"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "V辰lj nyckel genom din e-postadress"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "Ange nyckel manuellt"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "Anv辰ndar- eller nyckel-ID:"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "Anv辰nd inte SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "Anv辰nd SSL f旦r POP3-f旦rbindelse"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Anv辰nd STARTTLS-kommando f旦r att starta SSL-session"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "Anv辰nd SSL f旦r IMAP4-f旦rbindelse"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "Anv辰nd SSL f旦r NNTP-f旦rbindelse"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "Skicka (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "Anv辰nd SSL f旦r SMTP-f旦rbindelse"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr "Anv辰nd icke-blockerande SSL"
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 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:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "Ange SMTP-port"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "Ange POP3-port"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "Ange IMAP4-port"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "Ange NNTP-port"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "Ange dom辰nnamn"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "IMAP-servermapp"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "H辰mta alla meddelanden fr奪n server"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "L辰gg skickade meddelanden i"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "L辰gg utkast i"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "L辰gg borttagna meddelanden i"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "L辰gg borttagna meddelanden i"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "Kontonamn har inte angivits."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "E-postadress har inte angivits."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "SMTP-server har inte angivits."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "Anv辰ndar-ID har inte angivits."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "POP3-server har inte angivits."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4-server har inte angivits."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "NNTP-server har inte angivits."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6684,31 +6689,31 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 msgid "Sa_ve this image as..."
 msgstr "S_para denna bild som..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Skriv _nytt meddelande"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 msgid "Add to address _book..."
 msgstr "L辰gg till adress_boken"
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 msgid "Copy this add_ress"
 msgstr "Kopiera denna ad_ress"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 msgid "_Open with Web browser"
 msgstr "_��ppna med Webbl辰sare"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr "Kopiera denna _l辰nk"
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6721,7 +6726,7 @@ msgstr ""
 "\n"
 "��ppna den 辰nd奪?"
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr "Fejkad URL varning"
 
diff --git a/po/tr.po b/po/tr.po
index 32b06879..fd2deefa 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2004-12-03 11:44+0200\n"
 "Last-Translator: Arman Aksoy <armish@linux-sevenler.org>\n"
 "Language-Team:  <gnome-turk@gnome.org>\n"
@@ -24,196 +24,196 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Her hesap i巽in yap脹land脹rma dosyalar脹 okunuyor...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "%s adresine yap脹lm脹�� IMAP4 ba��lant脹s脹 koptu. Yeniden ba��lan脹l脹yor...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP sunucu dizini"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "%s:%d adresine IMAP4 ba��lant脹s脹 yap脹l脹yor ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "TLS oturumuna ba��lant脹 kurulamad脹.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "%d. ileti siliniyor"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "聴leti g旦nderiliyor (%d / %d bayt)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "%s%c%d mesaj脹 %s  i巽ine kopyalan脹yor...\n"
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "%s%c%d mesaj脹 %s  i巽ine kopyalan脹yor...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "%s konumundan iletiler al脹n脹yor..."
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "silinen i��aretler atanam脹yor: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "silinemiyor\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "%s konumundan iletiler al脹n脹yor..."
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "silinen i��aretler atanam脹yor: 1:*\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "dizin kapat脹lamad脹\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "%s k旦k dizini bulunamad脹\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "LIST al脹n脹rken hata olu��tu.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "%s olu��turulamad脹\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "%s Gelen alt脹nda olu��turulamad脹\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "posta kutusu yarat脹lam脹yor: Liste hatas脹\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "posta kutusu olu��turulamad脹\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "%s posta kutusunun ad脹 %s olarak de��i��tirilemedi \n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "posta kutusu silinemedi\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "zarf al脹namad脹\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "聴leti g旦nderiliyor (%d / %d bayt)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "zarf al脹n脹rken bir hata olu��tu.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "zarf ayr脹��t脹r脹lamad脹: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4 sunucuya ba��lant脹 kurulamad脹: %s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "IMAP4 oturumuna %s:%d ile ba��lant脹 kurulamad脹\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "alanad脹na eri��ilemedi\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "dizin se巽ilemedi: %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "imap komutu s脹ras脹nda hata olu��tu: CLOSE\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 yetkilendirmesi ba��ar脹s脹z.\n"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 giri��inde hata.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s, %s 端zerine eklenemedi\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(dosya g旦nderiliyor...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "ileti %s'ye eklenemiyor\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s, %s konumuna kopyalanamad脹\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap komutu s脹ras脹nda hata olu��tu: STORE %s %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "EXPUNGE komutu s脹ras脹nda hata olu��tu\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 msgid "error while imap command: CLOSE\n"
 msgstr "imap komutu s脹ras脹nda hata olu��tu: CLOSE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv, UTF-7 yi %s'e 巽eviremedi\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv %s yi UTF-7'ye 巽eviremedi\n"
@@ -301,25 +301,25 @@ msgstr "posta kutusu s脹f脹rlanam脹yor.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "%s daki mesajlar %s a aktar脹l脹yor...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "mesaj %s dan %s a kopyalanamad脹\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "i��aretli dosya a巽脹lamad脹.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "kaynak dizini hedef dizinle ayn脹.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "%s%c%d mesaj脹 %s  i巽ine kopyalan脹yor...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -328,7 +328,7 @@ msgstr ""
 "%s dosyas脹 zaten bulunuyor.\n"
 "Dizin olu��turulamad脹."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -340,77 +340,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "%s:%d adresine NNTP ba��lant脹s脹 yap脹l脹yor...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "%s:%d konumuna yap脹lan NNTP ba��lant脹s脹 koptu.Yeniden ba��lan脹l脹yor...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "%d iletisi zaten 旦nbelleklendi.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "%d. makale al脹n脹yor...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "%d. makale okunamad脹\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "makale postalanam脹yor.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "makale al脹nam脹yor : %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "grup se巽ilemiyor: %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ge巽ersiz makale aral脹��脹: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "yeni makale yok.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "%d - %d haber grubu al脹n脹yor (%s)...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "haber gruplar脹 al脹namad脹\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "haber gruplar脹 al脹n脹rken hata.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "hatal脹 haber grubu sat脹r脹 %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "X ba��l脹klar脹 al脹nam脹yor\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "x ba��l脹klar脹 al脹n脹rken hata olu��tu.\n"
 
@@ -488,7 +488,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "POP3 oturumunda hata olu��tu\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "Yap脹land脹rma dosyas脹na kay脹t yap脹lamad脹\n"
@@ -520,12 +520,12 @@ msgstr "procmime_get_text_content(): Kod 巽evriminde hata.\n"
 msgid "can't open mark file\n"
 msgstr "i��aret dosyas脹 a巽脹lamad脹\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "%d. ileti al脹namad脹\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Yazd脹rma komutu ge巽ersiz: `%s'\n"
@@ -692,7 +692,7 @@ msgstr ""
 msgid "Name"
 msgstr "聴sim"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -1159,7 +1159,7 @@ msgid "Group"
 msgstr "Grup"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Dizin"
@@ -1192,7 +1192,7 @@ msgstr "Not"
 msgid "Warning"
 msgstr "Uyar脹"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "Hata"
 
@@ -1740,7 +1740,7 @@ msgstr "MIME t端r端"
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "G旦nder"
@@ -1782,7 +1782,7 @@ msgid "Attach file"
 msgstr "Dosya ekle"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "聴mza"
@@ -1996,7 +1996,7 @@ msgid " Check File "
 msgstr " Dosyay脹 Denetle "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "Dosya"
 
@@ -2075,7 +2075,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2140,7 +2140,7 @@ msgstr "Zaman a��脹m脹 (sn) "
 msgid "Maximum Entries"
 msgstr "Azami Girdi Say脹s脹"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "Temel"
 
@@ -2197,7 +2197,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Se巽... "
 
@@ -2351,12 +2351,12 @@ msgstr "Dizin bilgisi ayarlan脹yor...\n"
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlan脹yor..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taran脹yor..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taran脹yor..."
@@ -2629,7 +2629,7 @@ msgstr "LDIF dosyas脹n脹 Adres Defterine aktar"
 msgid "Prev"
 msgstr "��nceki"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "Sonraki"
 
@@ -2650,143 +2650,143 @@ msgstr "Bitir"
 msgid "Sylpheed: %d new messages"
 msgstr "Tamamland脹 (%d yeni mesaj)"
 
-#: src/inc.c:388
+#: src/inc.c:433
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr " Kimlik denetimi"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "Yeni iletiler al脹n脹yor"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "Bekle"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "聴ptal edildi"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "Al脹n脹yor"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Tamamland脹 (%d mesaj, (%s) al脹nd脹)"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "Tamamland脹 (Yeni ileti yok)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "Ba��lant脹da hata"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "Kimlik denetiminde hata"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "Kilitli"
 
-#: src/inc.c:637
+#: src/inc.c:682
 msgid "Timeout"
 msgstr "Zaman a��脹m脹"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Tamamland脹 (%d yeni mesaj)"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "Tamamland脹 (yeni mesaj yok)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr " 聴letiler al脹n脹rken baz脹 hatalar olu��tu."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s hesab脹ndaki yeni iletiler al脹n脹yor...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr " Kimlik denetimi"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Yeni iletiler al脹n脹yor"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3 sunucusuna ba��lant脹 kuruluyor: %s ..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3 sunucuya ba��lant脹 kurulamad脹: %s:%d\n"
 
-#: src/inc.c:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "Kimlik denetimi yap脹l脹yor..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s konumundan iletiler al脹n脹yor..."
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Yeni ileti numaralar脹 al脹n脹yor (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Yeni ileti numaralar脹 al脹n脹yor (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Yeni ileti numaralar脹 al脹n脹yor (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "聴letilerin boyutlar脹 al脹n脹yor (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d. ileti siliniyor"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "��脹k脹l脹yor"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "聴letiler al脹n脹yor (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Al脹n脹yor (%d mesaj, (%s) al脹nd脹)"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 msgid "Connection failed."
 msgstr "Ba��lant脹da hata olu��tu."
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "聴letiler i��lenirken bir hata olu��tu."
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2795,28 +2795,28 @@ msgstr ""
 "E-posta i��lenirken hata olu��tu:\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "Yeterli disk alan脹 kalmad脹."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "Dosyaya yaz脹lamad脹."
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "protokol hatas脹"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr "Ba��lant脹 kar��脹 taraftan kesildi."
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "Posta kutusu kilitli"
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2825,11 +2825,11 @@ msgstr ""
 "Posta kutusu kilitli:\n"
 "%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 msgid "Authentication failed."
 msgstr "Yetkilendirmede hata olu��tu."
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2838,15 +2838,15 @@ msgstr ""
 "Yetkilendirme ba��ar脹s脹z:\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr "Oturum zaman a��脹m脹na u��rad脹."
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "聴ptal edildi\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s'den yeni mesajlar %s e al脹n脹yor...\n"
@@ -3738,7 +3738,7 @@ msgstr "T端m hesaplardaki postalar脹 da��脹t"
 msgid "Send queued message(s)"
 msgstr "Kuyruktaki iletileri g旦nder"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "D端zenle"
@@ -3780,62 +3780,62 @@ msgstr "聴letiyi sil"
 msgid "Set as junk mail"
 msgstr "��ntan脹ml脹 kullan"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "��al脹��t脹r"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "聴��aretli s端re巽leri 巽al脹��t脹r"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "Sonraki okunmam脹�� ileti"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "Tercihler"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "Ortak tercihler"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Hesap"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "Hesap ayarlar脹"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr "��evrimd脹��脹s脹n脹z. ��evrimi巽i olmak i巽in simgeye t脹klay脹n."
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr "��evrimi巽isiniz. ��evrimd脹��脹 olmak i巽in simgeye t脹klay脹n."
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "��脹k"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "Programdan 巽脹k脹ls脹n m脹?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 #, fuzzy
 msgid "Command line options"
 msgstr "Komut sat脹r脹 belirtilmedi."
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Kullan脹m: %s [SE��ENEKLER] ...\n"
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3851,7 +3851,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4061,225 +4061,230 @@ msgstr ""
 "Hatal脹 parola! Yeniden deneyin...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "Hesap tercihleri penceresi a巽脹l脹yor...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "Hesap%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "Yeni hesap i巽in tercihler"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Hesap tercihleri"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "Hesap tercihleri penceresi olu��turuluyor...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "Al"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "Gizlilik"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "Geli��mi��"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "Bu hesab脹n ad脹"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "��ntan脹ml脹 kullan"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "Ki��isel bilgiler"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "Tam ad脹"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "E-Posta adresi"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "Kurum"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "Sunucu bilgisi"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "Haber grubu (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "Hi巽biri (yerel)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "Bu sunucu parola istiyor"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "Haber grubu sunucusu"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "聴letilerin al脹naca��脹 sunucu"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "G旦nderme i巽in SMTP sunucu"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "Kullan脹c脹 ad脹"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "Parola"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 msgid "Use secure authentication (APOP)"
 msgstr "G端venli yetkilendirme kullan (APOP)"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "聴leti al脹nd脹��脹 zaman sunucudaki kopyas脹n脹 sil"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "Postay脹"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "g端n sonra sil"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 g端n: hemen sil)"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Sunucudaki t端m iletileri indir"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "Al脹nan ileti boyutu s脹n脹r脹"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "聴letileri al脹rken filtrele"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "��ntan脹ml脹 gelen kutusu"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Filtrelenmemi�� iletiler bu kutuda bekleyecektir)"
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "Kimlik denetim y旦ntemi"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "Sadece kullan脹c脹 kendi ald脹��脹nda"
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "聴letileri al脹rken filtrele"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "Haberler"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Indirilebilecek azami makale say脹s脹\n"
 "(0 => limitsiz)"
 
-#: src/prefs_account_dialog.c:1024
+#: src/prefs_account_dialog.c:1030
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Al脹c脹 belirtilmedi."
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 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:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Ba��l脹k"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "Tarih ba��l脹��脹n脹 ekle"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "聴leti Numaras脹 Olu��tur"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "Kullan脹c脹 tan脹ml脹 ba��l脹k ekle"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " D端zenle... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "Kimlik denetimi"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Kimlik Denetimi (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4288,200 +4293,200 @@ msgstr ""
 "E��er bu girdileri bo�� b脹rak脹rsan脹z, ayn脹\n"
 "kullan脹c脹 ad脹 ve parolas脹 kullan脹l脹r."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "G旦ndermeden 旦nce POP3 ile kimlik denetimi yap"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 msgid "Command output"
 msgstr "Komut 巽脹kt脹s脹"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 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:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "Yan脹tla"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "聴letileri 旦ntan脹ml脹 olarak imzala"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "聴letileri 旦ntan脹ml脹 olarak ��ifrele"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "ASCII format脹nda ��ifrele"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "Metin formatl脹 imza ekle"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "聴mza anahtar脹"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "��ntan脹ml脹 GnuPG anahtar脹n脹 kullan"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "Anahtar脹 e-posta adresine g旦re se巽"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "Anahtar脹 elle se巽"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "Kullan脹c脹 ya da anahtar numaras脹:"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "SSL kullanma"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "POP3 ba��lant脹s脹 i巽in SSL kullan"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "SSL oturumuna ba��lamak i巽in STARTSSL komutunu kullan"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "IMAP4 ba��lant脹s脹 i巽in SSL kullan"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "NNTP ba��lant脹s脹 i巽in SSL kullan"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "G旦nder (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "SMTP ba��lant脹s脹 i巽in SSL kullan"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr "Bloklanmam脹�� SSL Kullan"
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 #, 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:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "SMTP portu belirt"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "POP3 portu belirt"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "IMAP4 portu belirt"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "NNTP portu belirt"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "Alan ad脹 belirt"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "IMAP sunucu dizini"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Sunucudaki t端m iletileri indir"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "G旦nderilen iletileri nerede sakla"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "Taslak mesajlar脹n脹 buraya koy"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Silinen mesajlar脹 buraya koy"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "Silinen mesajlar脹 buraya koy"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "Hesap ad脹 girilmemi��."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "聴leti adresi girilmemi��."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "SMTP sunucu girilmemi��."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "Kullan脹c脹 numaras脹 girilmemi��."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "POP3 sunucu girilmemi��."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 sunucu girilmemi��."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "NNTP sunucu girilmemi��."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6766,36 +6771,36 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Farkl脹 kaydet..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Yeni ileti d端zenle"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/G旦ndericiyi adres defterine ekle"
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Ortak adres"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Taray脹c脹"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, fuzzy, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6807,7 +6812,7 @@ msgstr ""
 "g旦r端nenden (%s) farkl脹.\n"
 "Yine de a巽脹ls脹n m脹?"
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index e9a9837a..afc6f0f9 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2007-01-05 13:58+0300\n"
 "Last-Translator: O.R. Nykyforchyn <nick@pu.if.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -24,194 +24,194 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "丼亳��舒��仄仂 从仂仆����亞����舒������ 亟仍�� 从仂亢仆仂亞仂 亰舒仗亳����...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "��'��亟仆舒仆仆�� IMAP4 亟仂 %s 于����舒��亠仆仂. ����亟仆仂于仍�ﾑ�仄仂...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "弌亠��于亠�� IMAP4 于��亟从仍�ﾑ�亳于 LOGIN.\n"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "����于仂��亠仆仆�� 亰'��亟仆舒仆仆�� INAP4 亟仂 %s:%d ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "��亠 于亟舒仍仂���� 仗仂��舒��亳 ��亠������ TLS.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, c-format
 msgid "Getting message %d"
 msgstr "������亳仄����仄仂 仍亳���� %d"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "����亳��亟仆����仄仂 仍亳����亳 亟仂 %s (%d / %d)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "��亠��亠仆仂��亳仄仂 仍亳����亳 %s 于 %s ..."
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "��仂仗���ﾑ�仄仂 仍亳����亳 %s 于 %s ..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "��亳亟舒仍����仄仂 仍亳����亳 于��亟 %s"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "仆亠 于亟舒仍仂���� 于����舒仆仂于亳��亳 仗��舒仗仂��亠���� 于亳亟舒仍亠仆仆��: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "仆亠 于亟舒仍仂���� 仂��亳����亳��亳 仗舒仗从�� 于��亟 于亳亟舒仍亠仆亳�� 仍亳������于\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "��亳亟舒仍����仄仂 于���� 仍亳����亳 �� %s"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "仆亠 于亟舒仍仂���� 于����舒仆仂于亳��亳 仗��舒仗仂��亠���� 于亳亟舒仍亠仆仆��: 1:*\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "仆亠 于亟舒仍仂���� 亰舒从��亳��亳 仗舒仗从��\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "从仂��亠仆亠于舒 仗舒仗从舒 %s 仆亠 ����仆����\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "仗仂仄亳仍从舒 仗��亳 仂����亳仄舒仆仆�� LIST'舒.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "��亠 于亟舒仍仂���� ����于仂��亳��亳 '%s'\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "��亠 于亟舒仍仂���� ����于仂��亳��亳 '%s' 于��亠��亠亟亳仆�� INBOX\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "仆亠 于亟舒仍仂���� ����于仂��亳��亳 ��从��亳仆��从��: 仆亠于亟舒��舒 LIST\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "仆亠 于亟舒仍仂���� ����于仂��亳��亳 ��从��亳仆��从��\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "仆亠 于亟舒仍仂���� 仗亠��亠亶仄亠仆��于舒��亳 ��从��亳仆��从��: %s 仆舒 %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "仆亠 于亟舒仍仂���� 于亳亟舒仍亳��亳 ��从��亳仆��从��\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "仆亠 于亟舒仍仂���� 仂����亳仄舒��亳 从仂仆于亠����\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "������亳仄����仄仂 亰舒亞仂仍仂于从亳 仍亳������于 (%d / %d)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "����舒仗亳仍舒���� 仗仂仄亳仍从舒 仗��亳 仂����亳仄舒仆仆�� 从仂仆于亠����舒.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "仆亠 于亟舒仍仂���� ��仂亰��弍��舒��亳 从仂仆于亠����: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "��亠 于亟舒仍仂���� 亰'��亟仆舒��亳���� 亰 ��亠��于亠��仂仄 IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "��亠 于亟舒仍仂���� 于����舒仆仂于亳��亳 ��亠������ IMAP4 亰: %s:%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "仆亠 于亟舒仍仂���� 仂����亳仄舒��亳 仗��仂�������� ��仄亠仆\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "仆亠 于亟舒仍仂���� 仂����亳仄舒��亳 仗舒仗从��: %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 msgid "error on imap command: STATUS\n"
 msgstr "仗仂仄亳仍从舒 仗��亳 于亳从仂仆舒仆仆�� 从仂仄舒仆亟亳 imap: STATUS\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 msgid "IMAP4 authentication failed.\n"
 msgstr "��亠于亟舒��舒 舒于��仂��亳亰舒������ IMAP4.\n"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "��亠于亟舒��舒 舒于��仂��亳亰舒������ IMAP4.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "仆亠 于亟舒仍仂���� 亟仂亟舒��亳 %s 亟仂 %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(仗仂��亳仍舒��仄仂 ��舒亶仍...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "仆亠 于亟舒仍仂���� 仗��亳��亟仆舒��亳 仍亳���� 亟仂 %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "仆亠 于亟舒仍仂���� ��从仂仗���ﾐ火委�亳 %s 于 %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "仗仂仄亳仍从舒 仗��亳 于亳从仂仆舒仆仆�� 从仂仄舒仆亟亳 imap:  STORE %s %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "仗仂仄亳仍从舒 仗��亳 于亳从仂仆舒仆仆�� 从仂仄舒仆亟亳 imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 msgid "error while imap command: CLOSE\n"
 msgstr "仗仂仄亳仍从舒 仗��亳 于亳从仂仆舒仆仆�� 从仂仄舒仆亟亳 imap: CLOSE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv 仆亠 仄仂亢亠 从仂仆于亠������于舒��亳 UTF-7 于 %s\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv 仆亠 仄仂亢亠 从仂仆于亠������于舒��亳 %s 于 UTF-7\n"
@@ -298,25 +298,25 @@ msgstr "仆亠 于亟舒仍仂���� 仂弍����亰舒��亳 ��从��亳仆��从�� 亟仂 仆��仍��.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "��从��仗仂��������仄仂 仍亳����亳 亰 %s 于 %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "仆亠 于亟舒仍仂���� 从仂仗���ﾐ火委�亳 %s 于 %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "��亠 于亟舒仍仂���� 于��亟从��亳��亳 ��舒亶仍 仗仂亰仆舒��仂从.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "仗舒仗从舒 仗��亳亰仆舒��亠仆仆�� ��亟亠仆��亳��仆舒 亟仂 于亳����亟仆仂��.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "��仂仗���ﾑ�仄仂 仍亳���� %s%c%d 于 %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -325,7 +325,7 @@ msgstr ""
 "个舒亶仍 `%s' 于亢亠 ����仆����.\n"
 "��亠仄仂亢仍亳于仂 ����于仂��亳��亳 仗舒仗从��."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -346,77 +346,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "����于仂���ﾑ�仄仂 亰'��亟仆舒仆仆�� NNTP 亟仂 %s:%d ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "��'��亟仆舒仆仆�� NNTP 亟仂 %s:%d 弍��仍仂 ��仂亰����于舒仆仂. ����亟仆仂于仍�ﾑ�仄仂...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "����舒������ %d 于亢亠 从亠��仂于舒仆仂.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "仂����亳仄����仄仂 ����舒������ %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "仆亠 于亟舒仍仂���� 仗��仂��亳��舒��亳 ����舒������ %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "仆亠 于亟舒仍仂���� 仗仂��仍舒��亳 ����舒������.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "仆亠 于亟舒仍仂���� 仂����亳仄舒��亳 ����舒������ %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "仆亠 于亟舒仍仂���� 仂弍��舒��亳 从仂仆��亠��亠仆������: %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "仆亠于����仆亳亶 亟��舒仗舒亰仂仆 ����舒��亠亶: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "仆仂于亳�� ����舒����亠亶 仆亠仄舒.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "仂����亳仄����仄仂 xover %d - %d 于 %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "仆亠 于亟舒仍仂���� 仂����亳仄舒��亳 xover\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "����舒仗亳仍舒���� 仗仂仄亳仍从舒 仗��亳 仂����亳仄舒仆仆�� xover.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "仆亠于����仆亳亶 ���磲仂从 xover: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "仆亠 于亟舒仍仂���� 仂����亳仄舒��亳 xhdr\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "����舒仗亳仍舒���� 仗仂仄亳仍从舒 仗��亳 仂����亳仄舒仆仆�� xhdr.\n"
 
@@ -494,7 +494,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "仗仂仄亳仍从舒 仗��亟 ��舒�� ��亠������ POP3\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "仆亠 于亟舒仍仂���� 亰舒仗亳��舒��亳 从仂仆����亞����舒������ 于 ��舒亶仍\n"
@@ -524,12 +524,12 @@ msgstr "procmime_get_text_content(): ��亠��亠��于仂��亠仆仆�� 从仂亟��于 仆亠 于
 msgid "can't open mark file\n"
 msgstr "仆亠 于亟舒仍仂���� 于��亟从��亳��亳 ��舒亶仍 仗仂亰仆舒��仂从\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "仆亠 于亟舒仍仂���� �����磪��亳 仍亳���� %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "��亠于����仆舒 从仂仄舒仆亟舒 亟����从��: `%s'\n"
@@ -698,7 +698,7 @@ msgstr ""
 msgid "Name"
 msgstr "��仄'��"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "����仂��仂从仂仍"
 
@@ -1155,7 +1155,7 @@ msgid "Group"
 msgstr "������仗舒"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "��舒仗从舒"
@@ -1188,7 +1188,7 @@ msgstr "����亳仄����从舒"
 msgid "Warning"
 msgstr "��仂仗亠��亠亟亢亠仆仆��"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "��仂仄亳仍从舒"
 
@@ -1711,7 +1711,7 @@ msgstr "��亳仗 MIME"
 msgid "Size"
 msgstr "��仂亰仄����"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "��仂��仍舒��亳"
@@ -1753,7 +1753,7 @@ msgid "Attach file"
 msgstr "����亳��亟仆舒��亳 ��舒亶仍"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "����亟仗亳��"
@@ -1960,7 +1960,7 @@ msgid " Check File "
 msgstr " ��亠��亠于����亳��亳 ��舒亶仍 "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "个舒亶仍"
 
@@ -2038,7 +2038,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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2103,7 +2103,7 @@ msgstr "丐舒亶仄舒���� (��)"
 msgid "Maximum Entries"
 msgstr "��舒从��亳仄舒仍��仆亳亶 ��仂亰仄���� ��亠亰��仍����舒����"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " ��弍��舒��亳... "
 
@@ -2310,12 +2310,12 @@ msgstr "������舒仆仂于仍�ﾑ�仄仂 ��仆��仂��仄舒������ 仗舒仗从亳...\n"
 msgid "Setting folder info..."
 msgstr "������舒仆仂于仍�ﾑ�仄仂 ��仆��仂��仄舒������ 仗舒仗从亳..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "��亠��亠��亳������仄仂 仗舒仗从�� %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "��亠��亠��亳������仄仂 仗舒仗从�� %s ..."
@@ -2588,7 +2588,7 @@ msgstr "��仄仗仂������于舒��亳 ��舒亶仍 LDIF 于 舒亟��亠��仆�� 从仆亳亞��"
 msgid "Prev"
 msgstr "��舒亰舒亟"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "��舒仍��"
 
@@ -2609,142 +2609,142 @@ msgstr "��舒从��仆��亳��亳"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d 仆仂于亳�� 仍亳������于"
 
-#: src/inc.c:388
+#: src/inc.c:433
 msgid "Authenticating with POP3"
 msgstr "������亠仆��亳����从舒������ 亰 POP3"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "������亳仄舒仆仆�� 仆仂于亳�� 仍亳������于"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "������从��于舒仆仆��"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "弌从舒��仂于舒仆仂"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "������亳仄舒仆仆��"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "��亳从仂仆舒仆仂 (%d 仍亳����(��于) (%s) 仂����亳仄舒仆仂)"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "��亳从仂仆舒仆仂 (仆亠仄舒�� 仆仂于亳�� 仍亳������于)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "��亠于亟舒��舒 亰'��亟仆舒仆仆��"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "��亠于亟舒��舒 舒于��亠仆��亳����从舒������"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "��舒弍仍仂从仂于舒仆仂"
 
-#: src/inc.c:637
+#: src/inc.c:682
 msgid "Timeout"
 msgstr "丐舒亶仄舒����"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "��舒从��仆��亠仆仂 (%d 仆仂于亳�� 仍亳������于)"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "��舒从��仆��亠仆仂 (仆亠仄舒�� 仆仂于亳�� 仍亳������于)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "����亳 仂����亳仄舒仆仆�� 仗仂����亳 ����舒仗亳仍亳���� 亟亠�磻�� 仗仂仄亳仍从亳."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "仂����亳仄舒仆仆�� 仆仂于仂�� 仗仂����亳 亟仍�� 亰舒仗亳���� %s...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: ������亠仆��亳����从舒������ 亰 POP3"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: ������亳仄舒仆仆�� 仆仂于亳�� 仍亳������于"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "��'��亟仆����仄仂���� 亰 ��亠��于亠��仂仄 POP3: %s ..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "��亠 于亟舒仍仂���� 亰'��亟仆舒��亳���� 亰 ��亠��于亠��仂仄 POP3: %s:%d\n"
 
-#: src/inc.c:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "��于��亠仆��亳����从舒������..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "������亳仄����仄仂 仍亳����亳 于��亟 %s..."
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "������亳仄����仄仂 从��仍��从�������� 仆仂于亳�� 仍亳������于 (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "������亳仄����仄仂 从��仍��从�������� 仆仂于亳�� 仍亳������于 (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "������亳仄����仄仂 从��仍��从�������� 仆仂于亳�� 仍亳������于 (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "������亳仄����仄仂 ��仂亰仄���� 仍亳������于 (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "��亳亟舒仍����仄仂 仍亳���� %d"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "��亳��仂亟亳仄仂"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "������亳仄����仄仂 仍亳���� (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "������亳仄����仄仂 仍亳���� (%d 仍亳����(��于) (%s) 仂����亳仄舒仆仂)"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 msgid "Connection failed."
 msgstr "��亠于亟舒��舒 亰'��亟仆舒仆仆��."
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "����亳 仂弍��仂弍���� 仗仂����亳 ����舒仗亳仍舒���� 仗仂仄亳仍从舒."
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2753,28 +2753,28 @@ msgstr ""
 "����亳 仂弍��仂弍���� 仗仂����亳 ����舒仗亳仍舒���� 仗仂仄亳仍从舒:\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "��亠仄舒�� 于��仍��仆仂亞仂 仄�������� 仆舒 亟亳��从��."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "��亠 于亟舒仍仂���� 仗亳��舒��亳 于 ��舒亶仍."
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "��仂仄亳仍从舒 ��仂从亠��舒."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr "��'��亟仆舒仆仆�� 亰舒从��亳��仂 于��亟亟舒仍亠仆亳仄 ��仂����仂仄."
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "弌从��亳仆��从�� 亰舒弍仍仂从仂于舒仆仂."
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2783,11 +2783,11 @@ msgstr ""
 "弌从��亳仆��从�� 亰舒弍仍仂从仂于舒仆仂:\n"
 "%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 msgid "Authentication failed."
 msgstr "��亠于亟舒��舒 舒����亠仆��亳����从舒������."
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2796,15 +2796,15 @@ msgstr ""
 "��亠于亟舒��舒 舒����亠仆��亳����从舒������:\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr "丐舒亶仄舒���� ��亠������."
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "��从仍�ﾑ�亠仆仆�� ��从舒��仂于舒仆仂\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "������亳仄����仄仂 仆仂于�� 仍亳����亳 于��亟 %s 于 %s...\n"
@@ -3680,7 +3680,7 @@ msgstr "������亳仄舒��亳 仆仂于�� 仍亳����亳 亟仍�� 于������ 亰舒仗亳����于"
 msgid "Send queued message(s)"
 msgstr "����亟����仍舒��亳 仍亳����(亳) 亰 ��亠��亞亳"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "弌��于仂��亠仆仆�� 仍亳����舒"
@@ -3721,60 +3721,60 @@ msgstr "��亳亟舒仍亳��亳 仍亳����"
 msgid "Set as junk mail"
 msgstr "��于舒亢舒��亳 仄仂��仍仂��仂仄"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "��亳从仂仆舒��亳"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "��亳从仂仆舒��亳 仗仂亰仆舒��亠仆亳亶 仗��仂��亠��"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "��舒������仗仆亳亶 仆亠仗��仂��亳��舒仆亳亶 仍亳����"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "��舒仍舒������于舒仆仆��"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "弌仗��仍��仆�� 仆舒仍舒������于舒仆仆��"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "��弍仍��从仂于亳亶 亰舒仗亳��"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "��舒仍舒������于舒仆仆�� 亰舒仗亳����"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr "��'��亟仆舒仆仆�� 仆亠仄舒��. ��仍舒��仆������ 仆舒 ��从仂仆����, ��仂弍 仗��亟'��亟仆舒��亳����."
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr "��亳 仗��亟'��亟仆舒仆��. ��仍舒��仆������ 仆舒 ��从仂仆����, ��仂弍 于��亟'��亟仆舒��亳����."
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "��亳����亟"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "��亳亶��亳 亰 �������� 仗��仂亞��舒仄亳?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 msgid "Command line options"
 msgstr "��仗������ 从仂仄舒仆亟仆仂亞仂 ���磲从舒"
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "��亢亳于舒仆仆��: sylpheed [����丶����]..."
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3802,7 +3802,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4022,217 +4022,222 @@ msgstr ""
 "��仂亞舒仆亳亶 仗舒��仂仍��! ����仂弍����仄仂 亰仆仂于��...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "����亟从��亳������ 于��从仆舒 仂仗����亶 account'舒...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "��舒仗亳��%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "��舒仍舒������于舒仆仆�� 亟仍�� 仆仂于仂亞仂 亰舒仗亳����"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "��舒仍舒������于舒仆仆�� 亰舒仗亳����"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "弌��于仂��亠仆仆�� 于��从仆舒 仂仗����亶 亰舒仗亳����...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "������亳仄舒仆仆��"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "Advanced"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "��舒亰于舒 ����仂亞仂 亰舒仗亳����"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "������舒仆仂于亳��亳 �磻 default"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "����仂弍亳����舒 ��仆��仂��仄舒������"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "��仂于仆亠 ��仄'��"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "��仂����仂于舒 舒亟��亠��舒"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "����亞舒仆��亰舒������"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "��仆��仂��仄舒������ 仗��仂 ��亠��于亠��"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "��仂于亳仆亳 (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "��亠仄舒 (仍仂从舒仍��仆仂)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "丶亠亶 ��亠��于亠�� 于亳仄舒亞舒�� 舒����亠仆��亳����从舒������"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "弌亠��于亠�� 仆仂于亳仆"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "弌亠��于亠�� 亟仍�� 仂����亳仄舒仆仆��"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "弌亠��于亠�� SMTP (于��亟��亳仍舒仆仆��)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "ID 从仂��亳������于舒��舒"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "��舒��仂仍��"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 msgid "Use secure authentication (APOP)"
 msgstr "��亢亳于舒��亳 弍亠亰仗亠��仆�� 舒����亠仆��亳����从舒������ (APOP)"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "��亳亟舒仍����亳 仍亳����亳 仆舒 ��亠��于亠���� 仗����仍�� 仂����亳仄舒仆仆��"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "��亳亟舒仍亳��亳 ��亠��亠亰"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "亟仆��于"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 msgid "0 days: remove immediately"
 msgstr "0 亟仆��于 - 于亳亟舒仍����亳 仆亠亞舒亶仆仂"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 msgid "Download all messages (including already received) on server"
 msgstr "��舒于舒仆��舒亢亳��亳 于���� 仍亳����亳 仆舒 ��亠��于亠���� (于从仍�ﾑ�仆仂 亰 于亢亠 仂����亳仄舒仆亳仄亳)"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "��弍仄亠亢亠仆仆�� ��仂亰仄������ 仂����亳仄舒仆亳�� 仍亳������于"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "��弍"
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "个��仍��������于舒��亳 仍亳����亳 仗��亳 仂����亳仄舒仆仆��"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "������亟仆舒 仗舒仗从舒 亰舒 亰舒仄仂于����于舒仆仆�礆"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "丕 ����亶 仗舒仗���� ��从仍舒亟舒��仄仂 仆亠于��亟����仍������仂于舒仆�� 仍亳����亳."
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "��亠��仂亟 舒����亠仆��亳����从舒������"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "��于��仂仄舒��亳��仆仂"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
 msgstr "����亳 仂����亳仄舒仆仆�� ����仍��从亳 仗亠��亠于��������亳 INBOX"
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "个��仍��������于舒��亳 仍亳����亳 仗��亳 仂����亳仄舒仆仆��"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "��仂于亳仆亳"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 msgid "Maximum number of articles to download"
 msgstr "��舒从��亳仄舒仍��仆舒 从��仍��从�������� ����舒��亠亶 亟仍�� 亰舒于舒仆��舒亢亠仆仆��"
 
-#: src/prefs_account_dialog.c:1024
+#: src/prefs_account_dialog.c:1030
 msgid "No limit if 0 is specified."
 msgstr "��亠亰 仂弍仄亠亢亠仆��, �磻��仂 于从舒亰舒仆仂 0."
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 msgid "`Get all' checks for new messages on this account"
 msgstr "��亠��亠于��������亳 亰舒 从仂仄舒仆亟仂�� `������亳仄舒��亳 于����'"
 
-#: src/prefs_account_dialog.c:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "��舒亞仂仍仂于仂从"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "��仂亟舒��亳 仗仂仍亠 亟舒��亳 亰舒亞仂仍仂于从舒"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "��亠仆亠����于舒��亳 Message-ID"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "��亢亳于舒��亳 亰舒亞仂仍仂于仂从, 于亳亰仆舒��亠仆亳亶 从仂��亳������于舒��亠仄"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " ��亠亟舒亞��于舒��亳... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "������亠仆��亳����从舒������"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "������亠仆��亳����从舒������ SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4240,197 +4245,197 @@ msgstr ""
 "亊从��仂 ��亳 亰舒仍亳��亳��亠 ���� 仗仂仍�� 仗仂��仂亢仆��仄亳, 弍��亟亠 于亢亳��仂 ���� 亢 ID 从仂��亳������于舒��舒 ��舒 "
 "仗舒��仂仍��, ��仂 亶 亟仍�� 仂����亳仄舒仆仆��."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "������亠仆��亳����从舒������ POP3 仗亠��亠亟 于��亟��亳仍舒仆仆�礆"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr "�����礆亳亶 于于��亟 "
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 msgid "Command output"
 msgstr "��亳于��亟 从仂仄舒仆亟亳"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "��于��仂仄舒��亳��仆仂 于����舒仆仂于仍�ﾐ火委�亳 仆舒������仗仆�� 舒亟��亠��亳"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "��仂仗����"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "����亳��仂于舒仆仂"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "��于仂��仂��仆�� 舒亟��亠��舒"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "����亟仗亳����于舒��亳 仍亳���� 亰舒 亰舒仄仂于����于舒仆仆�礆"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "丿亳������于舒��亳 仍亳���� 亰舒 亰舒仄仂于����于舒仆仆�礆"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr "��仂仄亳仍从舒 仗��亳 于��亟仗仂于��亟�� 仆舒 ��亳����仂于舒仆亳亶 仍亳����"
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "��亢亳于舒��亳 \"ASCII-armored\" ��仂��仄舒�� 亟仍�� ��亳������于舒仆仆��"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "��亢亳于舒��亳 仗��亟仗亳�� 于��亟从��亳��亳仄 ��亠从����仂仄"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "��仍�ﾑ� 仗��亟仗亳����"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "��亢亳于舒��亳 从仍�ﾑ� GnuPG 亰舒 亰舒仄仂于����于舒仆仆�礆"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "��弍��舒��亳 从仍�ﾑ� 亰舒 ��舒��仂�� 舒亟��亠��仂�� e-mail"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "��亳亰仆舒��亳��亳 从仍�ﾑ� 于仍舒��仆仂������仆仂"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "��仂��亳������于舒�� 舒弍仂 ��亟亠仆��亳����从舒��仂�� 从仍�ﾑ�舒:"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "��亠 于亢亳于舒��亳 SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "��亢亳于舒��亳 SSL 亟仍�� 亰'��亟仆舒仆仆�� POP3"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "��亢亳于舒��亳 从仂仄舒仆亟�� STARTTLS 亟仍�� 仗仂��舒��从�� ��亠������ SSL"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "��亢亳于舒��亳 SSL 亟仍�� 亰'��亟仆舒仆仆�� IMAP4"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "��亢亳于舒��亳 SSL 亟仍�� 亰'��亟仆舒仆仆�� NNTP"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "����亟��亳仍从舒 (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "��亢亳于舒��亳 SSL 亟仍�� 亰'��亟仆舒仆仆�� SMTP"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr "��亢亳于舒��亳 仆亠弍仍仂从���ﾑ�亳亶 SSL"
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "��亳仄从仆������ ��亠, �磻��仂 ����亳从舒����亠���� 亰 仗��仂弍仍亠仄舒仄亳 仗��亳 亰'��亟仆舒仆仆�� SSL."
 
-#: src/prefs_account_dialog.c:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "��从舒亰舒��亳 仗仂���� SMTP"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "��从舒亰舒��亳 仗仂���� POP3"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "��从舒亰舒��亳 仗仂���� IMAP4"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "��从舒亰舒��亳 仗仂���� NNTP"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "��从舒亰舒��亳 ��仄'�� 亟仂仄亠仆舒"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "��舒��舒仍仂亞 ��亠��于亠��舒 IMAP"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "����亟亠 仗仂从舒亰舒仆仂 ����仍��从亳 仗��亟仗舒仗从亳 ����仂亞仂 从舒��舒仍仂亞舒."
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 msgid "Clear all message caches on exit"
 msgstr "����亳 于亳��仂亟�� 仂��亳��舒��亳 于���� 从亠���� 仗仂于��亟仂仄仍亠仆��"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "��弍亠����亞舒��亳 于��亟����仍舒仆�� 仍亳����亳 于"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "��弍亠����亞舒��亳 ��亠��仆亠��从亳 仍亳������于 于"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 msgid "Put queued messages in"
 msgstr "��弍亠����亞舒��亳 于亳亟舒仍亠仆�� 仍亳����亳 于"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "��弍亠����亞舒��亳 于亳亟舒仍亠仆�� 仍亳����亳 于"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "��舒亰于�� 亰舒仗亳���� 仆亠 于从舒亰舒仆仂."
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "��亠 于从舒亰舒仆仂 仗仂����仂于�� 舒亟��亠����."
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "��亠 于从舒亰舒仆仂 ��亠��于亠�� SMTP."
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "��亠 于从舒亰舒仆仂 ID 从仂��亳������于舒��舒."
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "��亠 于从舒亰舒仆仂 ��亠��于亠�� POP3."
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "��亠 于从舒亰舒仆仂 ��亠��于亠�� IMAP4."
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "��亠 于从舒亰舒仆仂 ��亠��于亠�� NNTP."
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr "��从舒亰舒仆舒 仗舒仗从舒 仆亠 �� 仗舒仗从仂�� ��亠��亞亳."
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6656,31 +6661,31 @@ msgid ""
 msgstr ""
 "��亠仄仂亢仍亳于仂 仗仂从舒亰舒��亳 ����仍仂 仍亳����舒 ��亠��亠亰 仆亠于亟舒���� 亰舒仗亳���� �� ��亳仄��舒��仂于亳亶 ��舒亶仍.\n"
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 msgid "Sa_ve this image as..."
 msgstr "��弍亠��亠亞��亳 亰仂弍��舒亢亠仆仆�� �磻..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "弌��于仂��亳��亳 仆仂于亳亶 仍亳����"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 msgid "Add to address _book..."
 msgstr "��仂亟舒��亳 亟仂 舒亟��亠��仆仂�� 从仆亳亞亳"
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 msgid "Copy this add_ress"
 msgstr "��仂仗���ﾐ火委�亳 ���� 舒亟��亠����"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 msgid "_Open with Web browser"
 msgstr "����亟从��亳��亳 Web-弍��舒��亰亠��仂仄"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr "弌从仂仗���ﾐ火委�亳 仗仂��亳仍舒仆仆��"
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6693,7 +6698,7 @@ msgstr ""
 "\n"
 "����亠 亢 于��亟从��亳��亳?"
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr "��仂仗亠��亠亟亢亠仆仆��: 仗��亟仄��仆舒 URL"
 
diff --git a/po/vi.po b/po/vi.po
index 170abb46..401703dd 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2006-04-16 22:05+0700\n"
 "Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -19,194 +19,194 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "��ang ��畛�c m畛�i c畉�u h狸nh cho m畛�i t��i kho畉�n...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "K畉�t n畛�i IMAP4 t畛�i %s ��達 b畛� ng畉�t. ��ang k畉�t n畛�i l畉�i...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "M叩y ch畛� IMAP4 c畉�m ����NG NH畉�P.\n"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "��ang t畉�o k畉�t n畛�i IMAP4 t畛�i %s:%d ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "Kh担ng th畛� kh畛�i ��畛�ng phi棚n TLS.\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, c-format
 msgid "Getting message %d"
 msgstr "��ang l畉�y th動 %d"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "��ang gh辿p th動 v��o %s (%d / %d)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "��ang chuy畛�n th動 %s t畛�i %s ..."
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "��ang ch辿p th動 %s t畛�i %s ..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "��ang xo叩 th動 %s"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kh担ng th畛� ��畉�t c畛� ��達 xo叩: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "kh担ng th畛� xo叩\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Xo叩 m畛�i th動 trong %s"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kh担ng th畛� ��畉�t c畛� ��達 xo叩: 1:*\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "kh担ng th畛� ��坦ng th動 m畛�c\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "th動 m畛�c g畛�c %s kh担ng t畛�n t畉�i\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "x畉�y ra l畛�i khi l畉�y LIST.\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Kh担ng th畛� t畉�o '%s'\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Kh担ng th畛� t畉�o '%s' 畛� INBOX\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kh担ng th畛� t畉�o h畛�p th動: LIST th畉�t b畉�i\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "kh担ng th畛� t畉�o h畛�p th動\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kh担ng th畛� ��畛�i t棚n h畛�p th動: %s th��nh %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "kh担ng th畛� xo叩 h畛�p th動\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "kh担ng th畛� l畉�y phong b狸\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "��ang l畉�y header c畛�a th動 (%d / %d)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "x畉�y ra l畛�i khi l畉�y phong b狸.\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kh担ng th畛� ph但n t鱈ch phong b狸: %s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Kh担ng th畛� k畉�t n畛�i t畛�i m叩y ch畛� IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Kh担ng th畛� t畉�o phi棚n IMAP4 v畛�i: %s:%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "kh担ng th畛� l畉�y kho畉�ng ��畛�nh danh (namespace)\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kh担ng th畛� ch畛�n th動 m畛�c: %s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 msgid "error on imap command: STATUS\n"
 msgstr "c坦 l畛�i khi ch畉�y l畛�nh imap: STATUS\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 msgid "IMAP4 authentication failed.\n"
 msgstr "X叩c th畛�c IMAP4 th畉�t b畉�i:\n"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "����ng nh畉�p IMAP4 th畉�t b畉�i.\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kh担ng th畛� ghep %s v��o %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(��ang g畛�i t畉�p tin...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kh担ng th畛� gh辿p th動 v��o %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kh担ng th畛� ch辿p %s t畛�i %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "c坦 l畛�i khi ch畉�y l畛�nh imap: STORE %s %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "c坦 l畛�i khi ch畉�y l畛�nh imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 msgid "error while imap command: CLOSE\n"
 msgstr "c坦 l畛�i khi ch畉�y l畛�nh imap: CLOSE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kh担ng th畛� chuy畛�n UTF-7 sang %s\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kh担ng th畛� chuy畛�n %s sang UTF-7\n"
@@ -291,25 +291,25 @@ msgstr "kh担ng th畛� gi畉�m s畛� l動畛�ng h畛�p th動 xu畛�ng 0.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Xu畉�t th動 t畛� %s sang %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "kh担ng th畛� ch辿p th動 %s t畛�i %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "Kh担ng th畛� m畛� t畉�p tin ��叩nh ��畉�u.\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "th動 m畛�c ngu畛�n c滴ng ch鱈nh l�� th動 m畛�c g畛�c.\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "��ang ch辿p th動 %s%c%d t畛�i %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -318,7 +318,7 @@ msgstr ""
 "T畉�p tin `%s' ��達 c坦 tr動畛�c.\n"
 "Kh担ng th畛� t畉�o th動 m畛�c."
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -337,77 +337,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "��ang t畉�o k畉�t n畛�i NNTP t畛�i %s:%d ...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "K畉�t n畛�i NNTP t畛�i %s:%d ��達 b畛� ng畉�t. ��ang k畉�t n畛�i l畉�i...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "v��n b畉�n %d v畛�a ��動畛�c ��動a v��o b畛� ��畛�m.\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "��ang l畉�y v��n b畉�n %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "kh担ng th畛� ��畛�c v��n b畉�n %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "kh担ng th畛� g畛�i b��i vi畉�t.\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "kh担ng th畛� l畉�y b��i vi畉�t %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "kh担ng ch畛�n ��動畛�c nh坦m: %s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ph畉�m vi b��i kh担ng h畛�p l畛�: %d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "kh担ng c坦 b��i m畛�i.\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "��ang l畉�y xover %d - %d trong %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "kh担ng l畉�y ��動畛�c vover\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "c坦 l畛�i khi l畉�y xover.\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "d嘆ng xover kh担ng h畛�p l畛�: %s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "kh担ng l畉�y ��動畛�c xhdr\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "c坦 l畛�i khi l畉�y xhdr.\n"
 
@@ -485,7 +485,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "c坦 l畛�i trong phi棚n l��m vi畛�c POP3\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "l畛�i khi l動u c畉�u h狸nh v��o t畉�p tin\n"
@@ -516,12 +516,12 @@ msgstr "procmime_get_text_content(): Chuy畛�n ��畛�i m達 th畉�t b畉�i.\n"
 msgid "can't open mark file\n"
 msgstr "kh担ng th畛� m畛� t畉�p tin ��叩nh d畉�u\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kh担ng th畛� l畉�y th動 %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "L畛�nh in kh担ng h畛�p l畛�: `%s'\n"
@@ -676,7 +676,7 @@ msgstr ""
 msgid "Name"
 msgstr "T棚n"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "Giao th畛�c"
 
@@ -1137,7 +1137,7 @@ msgid "Group"
 msgstr "Nh坦m"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Th動 m畛�c"
@@ -1170,7 +1170,7 @@ msgstr "Ch炭 箪"
 msgid "Warning"
 msgstr "C畉�nh b叩o"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "L畛�i"
 
@@ -1689,7 +1689,7 @@ msgstr "Ki畛�u MIME"
 msgid "Size"
 msgstr "K鱈ch th動畛�c"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "G畛�i"
@@ -1731,7 +1731,7 @@ msgid "Attach file"
 msgstr "��鱈nh k竪m t畉�p tin"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 msgid "Signature"
 msgstr "Ch畛� k鱈"
@@ -1938,7 +1938,7 @@ msgid " Check File "
 msgstr " Ki畛�m tra t畉�p tin "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1277
+#: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "T畉�p tin"
 
@@ -2016,7 +2016,7 @@ msgid "Edit JPilot Entry"
 msgstr "So畉�n m畛�c JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2081,7 +2081,7 @@ msgstr "H畉�t h畉�n (gi但y)"
 msgid "Maximum Entries"
 msgstr "S畛� m畛�c t畛�i ��a"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "C董 b畉�n"
 
@@ -2138,7 +2138,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "Ch畛�n... "
 
@@ -2289,12 +2289,12 @@ msgstr "Thi畉�t l畉�p th担ng tin th動 m畛�c...\n"
 msgid "Setting folder info..."
 msgstr "Thi畉�t l畉�p th担ng tin th動 m畛�c..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "��ang qu辿t th動 m畛�c %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "��ang qu辿t th動 m畛�c %s ..."
@@ -2567,7 +2567,7 @@ msgstr "Nh畉�p kh畉�u t畉�p tin LDIF v��o s畛� ��畛�a ch畛�"
 msgid "Prev"
 msgstr "Tr動畛�c"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "Ti畉�p"
 
@@ -2588,143 +2588,143 @@ msgstr "Ho��n th��nh"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d th動 m畛�i"
 
-#: src/inc.c:388
+#: src/inc.c:433
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "��ang x叩c th畛�c"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "��ang t畉�i v畛� th動 m畛�i"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "��畛�i"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "��達 b畛� hu畛� b畛�"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "��ang t畉�i v畛�"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Xong (%d th動 (%s) nh畉�n ��動畛�c)"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "Xong (kh担ng c坦 th動 m畛�i)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "K畉�t n畛�i th畉�t b畉�i"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "X叩c th畛�c th畉�t b畉�i"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "��達 kho叩"
 
-#: src/inc.c:637
+#: src/inc.c:682
 msgid "Timeout"
 msgstr "H畉�t gi畛�"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Ho��n t畉�t (%d th動 m畛�i)"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "Ho��n t畉�t (kh担ng c坦 th動 m畛�i)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "X畉�y ra m畛�t s畛� l畛�i khi nh畉�n th動."
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, 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:739
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "��ang x叩c th畛�c"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: ��ang nh畉�n th動 m畛�i"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "��ang k畉�t n畛�i t畛�i m叩y ch畛� POP3: %s..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, 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:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "��ang x叩c th畛�c..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "��ang l畉�y th動 tr棚n %s..."
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "��ang x叩c ��畛�nh s畛� l動畛�ng th動 m畛�i (STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "��ang x叩c ��畛�nh s畛� l動畛�ng th動 m畛�i (LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "��ang x叩c ��畛�nh s畛� l動畛�ng th動 m畛�i (UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "��ang x叩c ��畛�nh k鱈ch th動畛�c th動 (LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "��ang xo叩 th動 %d"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "��ang tho叩t"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "��ang l畉�y th動 (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "��ang l畉�y v畛� (��達 nh畉�n %d th動 (%s))"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 msgid "Connection failed."
 msgstr "K畉�t n畛�i th畉�t b畉�i."
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "C坦 l畛�i khi x畛� l鱈 th動."
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2733,28 +2733,28 @@ msgstr ""
 "C坦 l畛�i khi x畛� l鱈 th動:\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "畛� c畛�ng b畛� ��畉�y."
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "Kh担ng th畛� ghi l棚n t畉�p tin"
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "L畛�i socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr "K畉�t n畛�i b畛� ng畉�t b畛�i m叩y t畛� xa."
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "H畛�p th動 b畛� kho叩."
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2763,11 +2763,11 @@ msgstr ""
 "H畛�p th動 b畛� kho叩:\n"
 "%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 msgid "Authentication failed."
 msgstr "X叩c th畛�c th畉�t b畉�i."
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2776,15 +2776,15 @@ msgstr ""
 "X叩c th畛�c th畉�t b畉�i:\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr "Phi棚n l��m vi畛�c h畉�t gi畛�."
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "S叩p nh畉�p b畛� hu畛� b畛�\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "��ang l畉�y th動 t畛� %s v��o %s...\n"
@@ -3661,7 +3661,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:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Vi畉�t th動"
@@ -3702,60 +3702,60 @@ msgstr "Xo叩 th動"
 msgid "Set as junk mail"
 msgstr "Coi l�� th動 r叩c"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "Ch畉�y"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "Ch畉�y ti畉�n tr狸nh ��達 ��叩nh d畉�u"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "Th動 ch動a ��畛�c ti畉�p theo"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr ""
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "C畉�u h狸nh chung"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "T��i kho畉�n"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "Thi畉�t l畉�p t��i kho畉�n"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr "B畉�n ��ang ngo畉�i tuy畉�n. Nh畉�n v��o bi畛�u t動畛�ng ��畛� chuy畛�n sang tr畛�c tuy畉�n."
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr "B畉�n ��ang tr畛�c tuy畉�n. Nh畉�n v��o bi畛�u t動畛�ng ��畛� chuy畛�n sang ngo畉�i tuy畉�n."
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "Tho叩t"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "Tho叩t ch動董ng tr狸nh n��y?"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 msgid "Command line options"
 msgstr "Tu畛� ch畛�n d嘆ng l畛�nh"
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "C叩ch d湛ng: sylpheed [TU畛� CH畛�N]..."
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3783,7 +3783,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4003,218 +4003,223 @@ msgstr ""
 "M畉�t kh畉�u sai! Th畛� l畉�i...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 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:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "T��i kho畉�n %d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "C畉�u h狸nh cho t��i kho畉�n m畛�i"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "C畉�u h狸nh t��i kho畉�n"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 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:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "Nh畉�n"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "Ri棚ng t動"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "N但ng cao"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "T棚n c畛�a t��i kho畉�n n��y"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "��畉�t l�� m畉�c ��畛�nh"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "Th担ng tin c叩 nh但n"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "T棚n ��畉�y ��畛�"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "��畛�a ch畛� th動"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "T畛� ch畛�c"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "Th担ng tin m叩y ch畛�"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "Tin t畛�c (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "Kh担ng (n畛�i b畛�)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "M叩y ch畛� n��y y棚u c畉�u x叩c th畛�c"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "M叩y ch畛� tin t畛�c"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "M叩y ch畛� nh畉�n"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "M叩y ch畛� SMTP (g畛�i)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "ID ng動畛�i d湛ng"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "M畉�t kh畉�u"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 msgid "Use secure authentication (APOP)"
 msgstr "D湛ng x叩c th畛�c b畉�o m畉�t (APOP)"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "Xo叩 th動 kh畛�i m叩y ch畛� sau khi nh畉�n"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "Xo叩 sau"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "ng��y"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 msgid "0 days: remove immediately"
 msgstr "0 ng��y: xo叩 ngay l畉�p t畛�c"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "T畉�i m畛�i th動 tr棚n m叩y ch畛�"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "Gi畛�i h畉�n k鱈ch th動畛�c khi nh畉�n"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "L畛�c th動 khi nh畉�n"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "H畛�p nh畉�n m畉�c ��畛�nh"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 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:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "Ph動董ng th畛�c x叩c th畛�c"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "T畛� ��畛�ng"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 msgid "Only check INBOX on receiving"
 msgstr "Ch畛� ki畛�m tra H畛�p nh畉�n khi nh畉�n"
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "L畛�c th動 khi nh畉�n"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "Tin t畛�c"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 msgid "Maximum number of articles to download"
 msgstr "S畛� b��i t畉�i v畛� t畛�i ��a"
 
-#: src/prefs_account_dialog.c:1024
+#: src/prefs_account_dialog.c:1030
 msgid "No limit if 0 is specified."
 msgstr "Kh担ng gi畛�i h畉�n n畉�u ghi l�� 0"
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 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:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Header"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "Th棚m tr動畛�ng Ng��y th叩ng cho header"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "T畉�o ID c畛�a th動"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "Th棚m header theo ��畛�nh ngh挑a ng動畛�i d湛ng"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " So畉�n... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "X叩c th畛�c"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "X叩c th畛�c SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4222,197 +4227,197 @@ msgstr ""
 "N畉�u b畉�n b畛� tr畛�ng c叩c m畛�c n��y, ch動董ng tr狸nh s畉� d湛ng ID ng動畛�i d湛ng v�� m畉�t kh畉�u "
 "n��y khi nh畉�n."
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "X叩c th畛�c v畛�i POP3 tr動畛�c khi g畛�i"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 msgid "Command output"
 msgstr "��畉�u ra c畛�a l畛�nh"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "T畛� ��畛�ng ��畉�t ��畛�a ch畛� sau"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "H畛�i 但m cho"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "K鱈 t棚n theo m畉�c ��畛�nh"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "M達 ho叩 th動 theo m畉�c ��畛�nh"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr "M達 ho叩 khi tr畉� l畛�i th動 m達 ho叩"
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "D湛ng ��畛�nh d畉�ng ASCII-armored ��畛� m達 ho叩"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "D湛ng ch畛� k鱈 l�� v��n b畉�n thu畉�n tu箪"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "Kho叩 c畛�a ch畛� k鱈"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "D湛ng kho叩 GnuPG m畉�c ��畛�nh"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "Ch畛�n kho叩 theo ��畛�a ch畛� th動 c畛�a b畉�n"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "Ch畛� ��畛�nh kho叩 theo c叩ch th畛� c担ng"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "Ng動畛�i d湛ng ho畉�c ID c畛�a kho叩:"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "Kh担ng d湛ng SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "D湛ng SSL cho k畉�t n畛�i POP3"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 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:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "D湛ng SSL cho k畉�t n畛�i IMAP4"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "D湛ng SSL cho k畉�t n畛�i NNTP"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "G畛�i (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "D湛ng SSL cho k畉�t n畛�i SMTP"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr "D湛ng SSL d畉�ng kh担ng ch畉�n"
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 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:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "Ch畛� ��畛�nh c畛�ng STMP"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "Ch畛� ��畛�nh c畛�ng POP3"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "Ch畛� ��畛�nh c畛�ng IMAP4"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "Ch畛� ��畛�nh c畛�ng NNTP"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "Ch畛� ��畛�nh t棚n mi畛�n"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "Th動 m畛�c m叩y ch畛� IMAP"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 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:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "Chuy畛�n th動 ��達 g畛�i v��o"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "Chuy畛�n th動 nh叩p v��o"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 msgid "Put queued messages in"
 msgstr "Chuy畛�n th動 ��ang ��畛�i g畛�i v��o"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "Chuy畛�n th動 ��達 xo叩 v��o"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "T棚n t��i kho畉�n ch動a ��動畛�c nh畉�p"
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "��畛�a ch畛� th動 ch動a ��動畛�c nh畉�p"
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "M叩y ch畛� SMTP ch動a ��動畛�c nh畉�p"
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "ID ng動畛�i d湛ng ch動a ��動畛�c nh畉�p"
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "M叩y ch畛� POP3 ch動a ��動畛�c nh畉�p"
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "M叩y ch畛� IMAP4 ch動a ��動畛�c nh畉�p"
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "M叩y ch畛� NNTP ch動a ��動畛�c nh畉�p"
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6634,31 +6639,31 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 msgid "Sa_ve this image as..."
 msgstr "_L動u h狸nh 畉�nh n��y l��..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "So畉�n _th動 m畛�i"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 msgid "Add to address _book..."
 msgstr "Th棚m v��o _s畛� ��畛�a ch畛�..."
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 msgid "Copy this add_ress"
 msgstr "_Ch辿p ��畛�a ch畛� n��y"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 msgid "_Open with Web browser"
 msgstr "_M畛� v畛�i tr狸nh duy畛�t web"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr "Sao ch辿p li棚n _k畉�t n��y"
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6671,7 +6676,7 @@ msgstr ""
 "\n"
 "V畉�n m畛� n坦?"
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr "C畉�nh b叩o URL l畛�a ��畉�o"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5c9420c5..ddf8c626 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2005-03-17 09:22+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -20,196 +20,196 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "罩ｅ��莚糸��������絽��埇�����臀�...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "��� %s ��� IMAP4 菴��･綏我��綣����罩ｅ�������域���･...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP4 �����≦�����綵�"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "罩ｅ�����綮阪�� %s:%d ��� IMAP4 菴��･...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "���羈������� TLS 篌�莚����\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "罩ｅ�������ら��篁� %d"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "罩ｅ�����������篁� (%d / %d 絖����)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "罩ｅ��腱糸�����篁� %s%c%d ��� %s ...\n"
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "罩ｅ��紊���狗��篁� %s%c%d ��� %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "罩ｅ��篁� %s �ｷ������篁�..."
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "���羈�莅丞舟�����ゆ��綽�鐚�%s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "���羈�羝����\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "罩ｅ��篁� %s �ｷ������篁�..."
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "���羈�莅丞舟�����ゆ��綽�鐚�1:*\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "���羈���渇�����篁九す\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "��号��篁九す %s 筝�絖����\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "�ｷ������茵���九��������莚����\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "���羈����綮財��%s���\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "���羈������銀散膊延賢���綮財��%s���\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "���羈����綮咲��膊縁��LIST 紊沿乾\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "���羈����綮咲��膊�\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "���羈�絨����膊� %s �����遵��筝� %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "���羈������ら��膊�\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "���羈��ｷ���篆≦��\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "罩ｅ�����������篁� (%d / %d 絖����)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "�ｷ���篆≦����九��������莚����\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "���羈�茹ｆ��篆≦��鐚�%s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "���羈�菴��･���IMAP4�����≦��鐚�%s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "���羈�菴��･���IMAP4�����≦��鐚�%s:%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "���羈��ｷ緇����絖�腥咲��\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "���羈����������篁九す鐚�%s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "��ц��IMAP��巡擦��九��������莚�鐚�CLOSE\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 薨�莚�紊沿乾���\n"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 ��糸��紊沿乾���\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "���羈���� %s 羞糸����� %s\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "(罩ｅ�����������篁�...)"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "���羈�菴遵�����篁九�� %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "���羈�絨� %s 紊���九�� %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "��ц��IMAP��巡擦��九��������莚�鐚�STORE %s %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "��ц��IMAP��巡擦��九��������莚�鐚�EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 msgid "error while imap command: CLOSE\n"
 msgstr "��ц��IMAP��巡擦��九��������莚�鐚�CLOSE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ���羈�莉���� UTF-7 ��� %s\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ���羈�莉���� %s ��� UTF-7\n"
@@ -296,25 +296,25 @@ msgstr "���羈�絨����膊怨����や減腥冴��\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "罩ｅ��篁� %s 絲弱�坂拭篁九�� %s...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "���羈�紊���狗��篁� %s ��� %s\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "���羈����綣����莅井��篁吟��\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "羣����篁九す筝����������篁九す������筝�筝����\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "罩ｅ��紊���狗��篁� %s%c%d ��� %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -323,7 +323,7 @@ msgstr ""
 "���篁金��%s���綏峨��������\n"
 "���羈����綮堺��篁銀散���"
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -335,77 +335,77 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "罩ｅ�����綮阪�� %s:%d ���NNTP菴��･...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "��� %s:%d ���NNTP菴��･綏我��綣����罩ｅ�������域���･...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "���腴� %d 綏画←膽�絖����\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "罩ｅ��筝�莉醇��腴� %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "���羈�莚糸�����腴� %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "���羈����茵����腴����\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "���羈��ｷ������腴� %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "���羈�������膸�鐚�%s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "������������腴������器��%d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "羃≧����井��腴����\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "罩ｅ���ｷ��� %3$s ������ xover %1$d - %2$d...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "���羈��ｷ��� xover\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "�ｷ��� xover ��九��������莚����\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "��������� xover 茵�鐚�%s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "���羈��ｷ��� xhdr\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "�ｷ��� xhdr ��九��������莚����\n"
 
@@ -483,7 +483,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "POP3 篌�莚����������莚�\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "���羈������ラ��臀����篁�\n"
@@ -515,12 +515,12 @@ msgstr "procmime_get_text_content()鐚�篁ｇ��莉���√け茣ャ��\n"
 msgid "can't open mark file\n"
 msgstr "���羈����綣����莅井��篁�\n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "���羈��ｷ������篁� %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "�����医�巡擦茵�������鐚����%s���\n"
@@ -686,7 +686,7 @@ msgstr ""
 msgid "Name"
 msgstr "���腱�"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "��顒�"
 
@@ -1145,7 +1145,7 @@ msgid "Group"
 msgstr "臂ょ��"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "���篁九す"
@@ -1178,7 +1178,7 @@ msgstr "羈����"
 msgid "Warning"
 msgstr "茘����"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "���莚�"
 
@@ -1704,7 +1704,7 @@ msgstr "MIME 膠糸��"
 msgid "Size"
 msgstr "紊у��"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "������"
@@ -1746,7 +1746,7 @@ msgid "Attach file"
 msgstr "�����ラ��篁�"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 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:1277
+#: src/prefs_account_dialog.c:1284
 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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
@@ -2102,7 +2102,7 @@ msgstr "莇����(腱�)"
 msgid "Maximum Entries"
 msgstr "���紊ч々���"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 msgid "Basic"
 msgstr "��堺��"
 
@@ -2159,7 +2159,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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " ������... "
 
@@ -2313,12 +2313,12 @@ msgstr "罩ｅ��莅丞舟���篁九す篆≧��...\n"
 msgid "Setting folder info..."
 msgstr "罩ｅ��莅丞舟���篁九す篆≧��..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "罩ｅ�����������篁九す %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "罩ｅ�����������篁九す %s ..."
@@ -2591,7 +2591,7 @@ msgstr "絲弱�� LDIF ���篁九�医�医��膂�"
 msgid "Prev"
 msgstr "筝�筝�筝�"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "筝�筝�筝�"
 
@@ -2612,143 +2612,143 @@ msgstr "絎����"
 msgid "Sylpheed: %d new messages"
 msgstr "絎���� (%d 筝���育��篁�)"
 
-#: src/inc.c:388
+#: src/inc.c:433
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "罩ｅ��薨�莚�"
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "罩ｅ���ｷ�����育��篁�"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "莚欠��緇�"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "���羔�"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "罩ｅ���ｷ���"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "絎���� (��九�� %d 筝����篁� (%s))"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "絎���� (羃≧����育��篁�)"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "菴��･紊沿乾"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "薨�莚�紊沿乾"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "���篏�"
 
-#: src/inc.c:637
+#: src/inc.c:682
 msgid "Timeout"
 msgstr "莇����"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "絎���� (%d 筝���育��篁�)"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "絎���� (羃≧����育��篁�)"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "�ｷ������篁倶�九��������莚����"
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "罩ｅ���ｷ���絽���� %s �����育��篁�...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "罩ｅ��薨�莚�"
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s鐚�罩ｅ���ｷ�����育��篁�"
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "罩ｅ��菴��･POP3�����≦��鐚�%s..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "���羈�菴��･POP3�����≦��鐚�%s:%d\n"
 
-#: src/inc.c:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "罩ｅ��薨�莚�..."
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "罩ｅ��篁� %s �ｷ������篁�..."
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "罩ｅ���ｷ�����育��篁倶�育��(STAT)..."
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "罩ｅ���ｷ�����育��篁倶�育��(LAST)..."
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "罩ｅ���ｷ�����育��篁倶�育��(UIDL)..."
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "罩ｅ���ｷ�����育��篁句��紊у��(LIST)..."
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "罩ｅ�������ら��篁� %d"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "罩ｅ��������"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "罩ｅ���ｷ������篁� (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "罩ｅ���ｷ��� (��九�� %d 筝����篁� (%s))"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 msgid "Connection failed."
 msgstr "菴��･紊沿乾"
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "紊�������篁倶�九��������莚����"
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2757,28 +2757,28 @@ msgstr ""
 "紊�������篁倶�九��������莚�鐚�\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "羃≧�����篏�脾����腥咲�眼��"
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "���羈������ユ��篁吟��"
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "Socket���莚����"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr "菴�腮�筝紙�阪�渇��篋�菴��･���"
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "篆∞�沿←���篏����"
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2787,11 +2787,11 @@ msgstr ""
 "篆∞�沿←���篏�鐚�\n"
 "%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 msgid "Authentication failed."
 msgstr "薨�莚�紊沿乾���"
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2800,15 +2800,15 @@ msgstr ""
 "薨�莚�紊沿乾鐚�\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr "篌�莚�莇���吟��"
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "���綛倶�育��篁区←���羔�\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "罩ｅ��篁� %s �ｷ�����育��篁九�� %s...\n"
@@ -3691,7 +3691,7 @@ msgstr "���綛倶�����絽��埇����育��篁�"
 msgid "Send queued message(s)"
 msgstr "������������筝�������篁�"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "��医��"
@@ -3733,62 +3733,62 @@ msgstr "�����よ�ラ��篁�"
 msgid "Set as junk mail"
 msgstr "莅丞舟筝咲��莅ゅ�����"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "��ц��"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "��ц�����莅亥��紊����"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "筝�筝�筝����莚紫�����篁�"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "薤����蕁�"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "������薤����蕁�"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "絽����"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "絽��埈�丞舟"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr "���紊�篋�胼紫鎖��倶����������糸�丈�������√�医��膾睡�倶�����"
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr "���紊�篋����膾睡�倶����������糸�丈�������√�亥�紫鎖��倶�����"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "������"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "荀������堺��腮�綺����鐚�"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 #, fuzzy
 msgid "Command line options"
 msgstr "羃≧��莅丞舟��巡擦茵����"
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "���羈�鐚�%s [OPTION]...\n"
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3804,7 +3804,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4011,424 +4011,429 @@ msgstr ""
 "���莚������ｄ擦筝駕�����莚�...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "罩ｅ�����綣�絽��埌�����蕁合�����...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "絽����%d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "��医���埇��薤����蕁�"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "絽��埌�����蕁�"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "罩ｅ�����綮阪���埌�����蕁合�����...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "�･���"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "���腱�"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "蕭�膾�"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "絽��垸��腱�"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "莅丞舟筝咲��莅ゅ�����"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "筝�篋肴�����"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "������"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "���篁九�医��"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "膸�膸�"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "�����≦��莎����"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "��育�紫�� (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "���(������)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "莚ユ����≦�����荀�薨�莚�"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "��育�紫�������≦��"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "�･��倶����≦��"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "SMTP�����≦��(������)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "�����桁��"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "絲����"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 msgid "Use secure authentication (APOP)"
 msgstr "篏睡��絎����薨�莚� (APOP)"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "��九�育��篁九��篁������≦��筝�������"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "篁ュ��������"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "紊�"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 紊�鐚�腴���喝�����)"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "筝�莉醇����≦��筝�������������篁�"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "�･��九ぇ絨�������"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "����･��狗��篁倶�区��茵�菴�羯�"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "藥�莅ゆ�銀散膊�"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(羃≧��菴�羯ょ�����篁銀��篆�絖����莚ユ��篁九す筝�)"
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "薨�莚���号��"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "������"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "篁�������綏ユ･��倶��"
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "����･��狗��篁倶�区��茵�菴�羯�"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "��育��"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "筝�莉醇��腴�������紊ф�育��\n"
 "(���絎� 0 茵�腓堺��������)"
 
-#: src/prefs_account_dialog.c:1024
+#: src/prefs_account_dialog.c:1030
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "羃≧�����絎���銀散篋冴��"
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 msgid "`Get all' checks for new messages on this account"
 msgstr "����������･��金����倶����ヨ�ュ���埇����育��篁�"
 
-#: src/prefs_account_dialog.c:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "���篁九ご"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "羞糸����ユ��紊翫��"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "���������篁倶��莚�"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "羞糸�������桁��箙����紊翫��"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " 膽�莨�... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "薨�莚�"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP薨�莚�(SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "絋�������筝�紂�菴�篋�蕁刻��絨�篏睡������･��狗��篁句�後����������桁�������ｄ擦���"
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "������������POP3薨�莚�"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 msgid "Command output"
 msgstr "��巡擦莨����"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "������莅丞舟篁ヤ����医��"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "������"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "絲�篁倶�����"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "���紊����"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "藥�莅ゅ�拷��篁句�上��"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "藥�莅ゅ�拷��篁九��絲�"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "篏睡�� ASCII ���茖号�弱�颷�茵����絲�"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "篏睡��������膈上��"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "膈上��絲����"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "篏睡��藥�莅ょ��GnuPG絲����"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "�����ч��篁九�医��������絲����"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "���綏ユ��絎�絲����"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "�����傑�����絲����ID鐚�"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "筝�篏睡��SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "篏睡��SSL菴��･POP3�����≦��"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "篏睡��STARTTLS��巡擦綣�紮�SSL篌�莚�"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "篏睡��SSL菴��･IMAP4�����≦��"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "篏睡��SSL菴��･NNTP�����≦��"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "������(SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "篏睡��SSL菴��･SMTP�����≦��"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr "篏睡�������糸��綣�SSL"
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(絋�������������SSL菴��･���蘂�鐚�莚桁�渇��莚ラ��蕁�)"
 
-#: src/prefs_account_dialog.c:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "���絎�SMTP腴����"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "���絎�POP3腴����"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "���絎�IMAP4腴����"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "���絎�NNTP腴����"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "���絎�������"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "IMAP4 �����≦�����綵�"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "筝�莉醇����≦��筝�������������篁�"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "絨�綏峨����榊�����篁銀��絖�篋�"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "絨����篁区��腮推��絖�篋�"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "絨������ょ�����篁銀��絖�篋�"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "絨������ょ�����篁銀��絖�篋�"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "羃≧��莨���ュ���垸��腱違��"
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "羃≧��莨���ラ��篁九�医�����"
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "羃≧��莨����SMTP�����≦�����"
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "羃≧��莨���ョ����傑��莚����"
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "羃≧��莨����POP3�����≦�����"
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "羃≧��莨����IMAP4�����≦�����"
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "羃≧��莨����NNTP�����≦�����"
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6696,35 +6701,35 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 msgid "Sa_ve this image as..."
 msgstr "��上���Ϊ��筝�(_V)..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "��医����育��篁�"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/羞糸�����篁銀査��医�医��膂�(_K)"
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "紊���狗�丈･(_L)"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "臀�蕁究�頵����"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr "紊���狗�丈･(_L)"
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, fuzzy, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6736,7 +6741,7 @@ msgstr ""
 "��丞ず��� URL (%s) 筝�������\n"
 "篁���区�����綣����鐚�"
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7b6b5144..6bc0f4a8 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: 2007-01-15 17:38+0900\n"
+"POT-Creation-Date: 2007-01-18 13:56+0900\n"
 "PO-Revision-Date: 2005-10-25 16:23+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -21,194 +21,194 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "莅����������絽活�����荐�絎�筝�...\n"
 
-#: libsylph/imap.c:465
+#: libsylph/imap.c:469
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "��� %s ��� IMAP4 ��ｇ��茴�筝���隙����������育�ｇ��筝�...\n"
 
-#: libsylph/imap.c:520 libsylph/imap.c:526
+#: libsylph/imap.c:524 libsylph/imap.c:530
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP4 篌堺�������������糸�ャ��\n"
 
-#: libsylph/imap.c:602
+#: libsylph/imap.c:606
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "罩ｅ����∝�� IMAP4 ��ｇ����� %s:%d ...\n"
 
-#: libsylph/imap.c:646
+#: libsylph/imap.c:650
 msgid "Can't start TLS session.\n"
 msgstr "��≧�������� TLS ��ｇ��\n"
 
-#: libsylph/imap.c:1120
+#: libsylph/imap.c:1159
 #, c-format
 msgid "Getting message %d"
 msgstr "��桁��膃� %d �����灸散"
 
-#: libsylph/imap.c:1236
+#: libsylph/imap.c:1275
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "��������灸散��� %s (%d / %d)"
 
-#: libsylph/imap.c:1328
+#: libsylph/imap.c:1367
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "罩ｅ��腱糸����灸散 %s ��� %s ..."
 
-#: libsylph/imap.c:1334
+#: libsylph/imap.c:1373
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "罩ｅ��茲�茖初�灸散 %s ��� %s ..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "罩ｅ��腱脂�ら�灸散 %s"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "��≧��荐�絎������ょ�����罔�鐚�%s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "��≧��������\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "罩ｅ��腱脂�� %s 筝������������灸散"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "��≧��荐�絎������ょ�����罔�鐚�1:*\n"
 
-#: libsylph/imap.c:1624
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "��≧����御��莖����紊�\n"
 
-#: libsylph/imap.c:1702
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "��壕�����紊� %s 筝�絖�������\n"
 
-#: libsylph/imap.c:1891 libsylph/imap.c:1899
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "���緇� LIST �����主�����茯ゃ��\n"
 
-#: libsylph/imap.c:2013
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "��≧����∝�� %s\n"
 
-#: libsylph/imap.c:2018
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "��≧�������銀散紊鞘����∝�� %s\n"
 
-#: libsylph/imap.c:2079
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "��≧����∝��篆∞�縁��LIST 紊掩��\n"
 
-#: libsylph/imap.c:2099
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "��≧����∝��篆∞��\n"
 
-#: libsylph/imap.c:2203
+#: libsylph/imap.c:2242
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "篆∞�� %s ��≧����翫����� %s\n"
 
-#: libsylph/imap.c:2283
+#: libsylph/imap.c:2322
 msgid "can't delete mailbox\n"
 msgstr "��≧�������や拭膊�\n"
 
-#: libsylph/imap.c:2327
+#: libsylph/imap.c:2366
 msgid "can't get envelope\n"
 msgstr "��≧�����緇�篆≦�����\n"
 
-#: libsylph/imap.c:2340
+#: libsylph/imap.c:2379
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "��桁����灸散茵���� (%d / %d)"
 
-#: libsylph/imap.c:2350
+#: libsylph/imap.c:2389
 msgid "error occurred while getting envelope.\n"
 msgstr "���緇�篆≦�������主�����茯ゃ��\n"
 
-#: libsylph/imap.c:2372
+#: libsylph/imap.c:2411
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "��≧��茹ｆ��篆≦��鐚�%s\n"
 
-#: libsylph/imap.c:2496
+#: libsylph/imap.c:2535
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "��≧����ｇ����� IMAP4 篌堺�����鐚�%s:%d\n"
 
-#: libsylph/imap.c:2503
+#: libsylph/imap.c:2542
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "��≧����∝�� IMAP4 ��ｇ��鐚�%s:%d\n"
 
-#: libsylph/imap.c:2578
+#: libsylph/imap.c:2617
 msgid "can't get namespace\n"
 msgstr "��≧�����緇�篆≦�����\n"
 
-#: libsylph/imap.c:3111
+#: libsylph/imap.c:3150
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "��≧����御��莖����紊常��%s\n"
 
-#: libsylph/imap.c:3146
+#: libsylph/imap.c:3185
 msgid "error on imap command: STATUS\n"
 msgstr "��主�����茯ょ�� imap ��巡擦鐚� STATUS\n"
 
-#: libsylph/imap.c:3269 libsylph/imap.c:3304
+#: libsylph/imap.c:3308 libsylph/imap.c:3343
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 茯�茘�紊掩��\n"
 
-#: libsylph/imap.c:3353
+#: libsylph/imap.c:3392
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 ��糸�ュけ������\n"
 
-#: libsylph/imap.c:3690
+#: libsylph/imap.c:3729
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "��≧��絨���灸散緇� %s ���腱糸�� %s���\n"
 
-#: libsylph/imap.c:3697
+#: libsylph/imap.c:3736
 msgid "(sending file...)"
 msgstr "鐚������堺��罅� ...鐚�"
 
-#: libsylph/imap.c:3726
+#: libsylph/imap.c:3765
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "��≧��������荐������� %s\n"
 
-#: libsylph/imap.c:3758
+#: libsylph/imap.c:3797
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "��≧��絨���灸散 %s 腱糸�� %s\n"
 
-#: libsylph/imap.c:3782
+#: libsylph/imap.c:3821
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap ��主�����茯わ����巡擦��削�� STORE %s %s\n"
 
-#: libsylph/imap.c:3796
+#: libsylph/imap.c:3835
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap ��主�����茯わ����巡擦��削�� EXPUNGE\n"
 
-#: libsylph/imap.c:3809
+#: libsylph/imap.c:3848
 msgid "error while imap command: CLOSE\n"
 msgstr "imap ��主�����茯わ����巡擦��削�� CLOSE\n"
 
-#: libsylph/imap.c:4085
+#: libsylph/imap.c:4124
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "��≧��絨� UTF-7 莉������� %s\n"
 
-#: libsylph/imap.c:4115
+#: libsylph/imap.c:4154
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "��≧��莉���� %s ��� UTF-7\n"
@@ -295,25 +295,25 @@ msgstr "��≧��羝���や拭膊宴��\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "絨���灸散��� %s �����阪�� %s 筝�...\n"
 
-#: libsylph/mh.c:427
+#: libsylph/mh.c:463
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "��≧��絨���灸散緇� %s ���腱糸�� %s���\n"
 
-#: libsylph/mh.c:502 libsylph/mh.c:625
+#: libsylph/mh.c:538 libsylph/mh.c:661
 msgid "Can't open mark file.\n"
 msgstr "��≧��������罔�荐����罟�罅����\n"
 
-#: libsylph/mh.c:509 libsylph/mh.c:631
+#: libsylph/mh.c:545 libsylph/mh.c:667
 msgid "the src folder is identical to the dest.\n"
 msgstr "箴�羣����������莖����紊丞�後�����\n"
 
-#: libsylph/mh.c:634
+#: libsylph/mh.c:670
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "罩ｅ��茲�茖処����� %s%c%d ��� %s ...\n"
 
-#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -322,7 +322,7 @@ msgstr ""
 "罟�罅����%s���綏峨��������\n"
 "��≧����∝��莖����紊障��"
 
-#: libsylph/mh.c:1500
+#: libsylph/mh.c:1536
 #, c-format
 msgid ""
 "Directory name\n"
@@ -340,77 +340,77 @@ msgstr ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
-#: libsylph/news.c:207
+#: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "��∝����域�����荐����絎���ｇ����� %s:%d , 茫�腮����...\n"
 
-#: libsylph/news.c:276
+#: libsylph/news.c:277
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "��� %s:%d �����域�����荐����絎���ｇ��茴�筝���隙����������育�ｇ��筝�...\n"
 
-#: libsylph/news.c:377
+#: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "���腴� %d 綏牙��茴����絖���弱辱���箙�筝����\n"
 
-#: libsylph/news.c:397
+#: libsylph/news.c:398
 #, c-format
 msgid "getting article %d...\n"
 msgstr "罩ｅ����桁�����腴� %d...\n"
 
-#: libsylph/news.c:401
+#: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
 msgstr "��≧��莅�������腴� %d\n"
 
-#: libsylph/news.c:676
+#: libsylph/news.c:677
 msgid "can't post article.\n"
 msgstr "��≧����取；���腴����\n"
 
-#: libsylph/news.c:702
+#: libsylph/news.c:703
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "��≧�����緇����腴� %d\n"
 
-#: libsylph/news.c:759
+#: libsylph/news.c:760
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "��≧����御����域��臂ょ��鐚�%s\n"
 
-#: libsylph/news.c:796
+#: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "���茯ょ�����腴�膀����鐚�%d - %d\n"
 
-#: libsylph/news.c:809
+#: libsylph/news.c:810
 msgid "no new articles.\n"
 msgstr "羃������井��腴����\n"
 
-#: libsylph/news.c:819
+#: libsylph/news.c:820
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "罩ｅ����桁�� xover %d - %d ��� %s...\n"
 
-#: libsylph/news.c:823
+#: libsylph/news.c:824
 msgid "can't get xover\n"
 msgstr "��≧�����緇� xover\n"
 
-#: libsylph/news.c:833
+#: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
 msgstr "���緇� xover �����主�����茯ゃ��\n"
 
-#: libsylph/news.c:843
+#: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "xover ��у�拷��茯わ��%s\n"
 
-#: libsylph/news.c:862 libsylph/news.c:894
+#: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
 msgstr "��≧�����緇� xhdr\n"
 
-#: libsylph/news.c:874 libsylph/news.c:906
+#: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
 msgstr "���緇� xhdr �����主�����茯ゃ��\n"
 
@@ -488,7 +488,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "篏睡�� POP3 ���荐����絎������主�����茯�\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
+#: libsylph/prefs_account.c:220 libsylph/prefs_account.c:234
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "絲���ョ�����荐�絎����紊掩�����\n"
@@ -519,12 +519,12 @@ msgstr "procmime_get_text_content(): 莉�腆弱け������\n"
 msgid "can't open mark file\n"
 msgstr "��≧��������罔�腓榊��罟�罅� \n"
 
-#: libsylph/procmsg.c:1132
+#: libsylph/procmsg.c:1134
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "��≧����桁����灸散 %d\n"
 
-#: libsylph/procmsg.c:1364
+#: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "�����医�巡擦���茯わ�����%s���\n"
@@ -691,7 +691,7 @@ msgstr ""
 msgid "Name"
 msgstr "���腮�"
 
-#: src/account_dialog.c:373 src/prefs_account_dialog.c:690
+#: src/account_dialog.c:373 src/prefs_account_dialog.c:693
 msgid "Protocol"
 msgstr "���荐����絎�"
 
@@ -1150,7 +1150,7 @@ msgid "Group"
 msgstr "臂ょ��"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1764
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "莖����紊�"
@@ -1183,7 +1183,7 @@ msgstr "羈����"
 msgid "Warning"
 msgstr "茘����"
 
-#: src/alertpanel.c:168 src/inc.c:634
+#: src/alertpanel.c:168 src/inc.c:679
 msgid "Error"
 msgstr "���茯�"
 
@@ -1706,7 +1706,7 @@ msgstr "MIME ������"
 msgid "Size"
 msgstr "紊у��"
 
-#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:553
+#: src/compose.c:4864 src/mainwindow.c:2382 src/prefs_account_dialog.c:556
 #: src/prefs_common_dialog.c:684
 msgid "Send"
 msgstr "������"
@@ -1748,7 +1748,7 @@ msgid "Attach file"
 msgstr "������罟�罅�"
 
 #. signature
-#: src/compose.c:4913 src/prefs_account_dialog.c:1243
+#: src/compose.c:4913 src/prefs_account_dialog.c:1250
 #: src/prefs_common_dialog.c:1009
 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:1277
+#: src/prefs_account_dialog.c:1284
 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:1792
+#: src/importldif.c:535 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr "..."
@@ -2100,7 +2100,7 @@ msgstr "��丈�� (腱�)"
 msgid "Maximum Entries"
 msgstr "���������紊у��"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:549
+#: src/editldap.c:471 src/prefs_account_dialog.c:552
 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:951
+#: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "��御��..."
 
@@ -2309,12 +2309,12 @@ msgstr "荐�絎�莖����紊�...\n"
 msgid "Setting folder info..."
 msgstr "荐�絎�莖����紊�..."
 
-#: src/folderview.c:868 src/mainwindow.c:3654 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3656 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "�����顚����紊� %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3659 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3661 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "�����顚����紊� %s ..."
@@ -2588,7 +2588,7 @@ msgstr "絨� LDIF 罟������ラ��荐����"
 msgid "Prev"
 msgstr "���筝�絨�"
 
-#: src/importldif.c:769 src/mainwindow.c:2478
+#: src/importldif.c:769 src/mainwindow.c:2480
 msgid "Next"
 msgstr "筝�筝�絨�"
 
@@ -2609,143 +2609,143 @@ msgstr "絎����"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d 絨���育�灸散"
 
-#: src/inc.c:388
+#: src/inc.c:433
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "茯�茘�筝�..."
 
-#: src/inc.c:414
+#: src/inc.c:459
 msgid "Retrieving new messages"
 msgstr "���緇���育�灸散筝�"
 
-#: src/inc.c:457
+#: src/inc.c:502
 msgid "Standby"
 msgstr "膈�緇�������筝�"
 
-#: src/inc.c:591 src/inc.c:640
+#: src/inc.c:636 src/inc.c:685
 msgid "Cancelled"
 msgstr "���羔�"
 
-#: src/inc.c:602
+#: src/inc.c:647
 msgid "Retrieving"
 msgstr "莅����筝�"
 
-#: src/inc.c:611
+#: src/inc.c:656
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "絎���� 鐚�綏我･��� %d 絨���灸散 (%s)鐚�"
 
-#: src/inc.c:615
+#: src/inc.c:660
 msgid "Done (no new messages)"
 msgstr "絎����鐚���≧�育�灸散鐚�"
 
-#: src/inc.c:621
+#: src/inc.c:666
 msgid "Connection failed"
 msgstr "��ｇ��紊掩�����"
 
-#: src/inc.c:624
+#: src/inc.c:669
 msgid "Auth failed"
 msgstr "茯�茘�紊掩��"
 
-#: src/inc.c:627
+#: src/inc.c:672
 msgid "Locked"
 msgstr "綏臥��絎�"
 
-#: src/inc.c:637
+#: src/inc.c:682
 msgid "Timeout"
 msgstr "��丈��"
 
-#: src/inc.c:687
+#: src/inc.c:732
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "絎����鐚�%d 絨���育�灸散鐚�"
 
-#: src/inc.c:690
+#: src/inc.c:735
 msgid "Finished (no new messages)"
 msgstr "絎����鐚���≧�育�灸散鐚�"
 
-#: src/inc.c:699
+#: src/inc.c:744
 msgid "Some errors occurred while getting mail."
 msgstr "���緇���灸散�����主�����茯ゃ��"
 
-#: src/inc.c:735
+#: src/inc.c:780
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "���緇� %s �����育�灸散筝�, 茫�腮����...\n"
 
-#: src/inc.c:739
+#: src/inc.c:784
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "茯�茘�筝�..."
 
-#: src/inc.c:742
+#: src/inc.c:787
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: ���緇���育�灸散筝�, 茫�腮����..."
 
-#: src/inc.c:761
+#: src/inc.c:806
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "��ｇ����� POP3 篌堺����� %s 筝�..."
 
-#: src/inc.c:772
+#: src/inc.c:817
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "��≧����ｇ����� POP3 篌堺�����鐚�%s:%d\n"
 
-#: src/inc.c:851 src/send_message.c:641
+#: src/inc.c:896 src/send_message.c:641
 msgid "Authenticating..."
 msgstr "茯�茘�"
 
-#: src/inc.c:852
+#: src/inc.c:897
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "緇� %s 筝����緇���灸散筝�..."
 
-#: src/inc.c:857
+#: src/inc.c:902
 msgid "Getting the number of new messages (STAT)..."
 msgstr "���緇���育�灸散�����檎�鋇�"
 
-#: src/inc.c:861
+#: src/inc.c:906
 msgid "Getting the number of new messages (LAST)..."
 msgstr "���緇���育�灸散�����檎�鋇�"
 
-#: src/inc.c:865
+#: src/inc.c:910
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "���緇���育�灸散�����檎�鋇�"
 
-#: src/inc.c:869
+#: src/inc.c:914
 msgid "Getting the size of messages (LIST)..."
 msgstr "���緇���育�灸散�����檎�鋇�"
 
-#: src/inc.c:879
+#: src/inc.c:924
 #, c-format
 msgid "Deleting message %d"
 msgstr "�����ょ�� %d �����灸散"
 
-#: src/inc.c:886 src/send_message.c:659
+#: src/inc.c:931 src/send_message.c:659
 msgid "Quitting"
 msgstr "��∫��"
 
-#: src/inc.c:911
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "���緇���育�灸散 (%d / %d) (%s / %s)"
 
-#: src/inc.c:932
+#: src/inc.c:977
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "���緇���育�灸散 (��� %d 絨���育�灸散, %s 綏我･��駈��"
 
-#: src/inc.c:1177
+#: src/inc.c:1222
 msgid "Connection failed."
 msgstr "��ｇ��紊掩�����"
 
-#: src/inc.c:1183
+#: src/inc.c:1228
 msgid "Error occurred while processing mail."
 msgstr "��������灸散�����主�����茯ゃ��"
 
-#: src/inc.c:1188
+#: src/inc.c:1233
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2754,39 +2754,39 @@ msgstr ""
 "��������灸散�����主�����茯わ��\n"
 "%s"
 
-#: src/inc.c:1194
+#: src/inc.c:1239
 msgid "No disk space left."
 msgstr "脾�腆�腥咲��綏我賛���"
 
-#: src/inc.c:1199
+#: src/inc.c:1244
 msgid "Can't write file."
 msgstr "��≧��絲���ユ��罅����"
 
-#: src/inc.c:1204
+#: src/inc.c:1249
 msgid "Socket error."
 msgstr "Socket ������茯�"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1210 src/send_message.c:594 src/send_message.c:785
+#: src/inc.c:1255 src/send_message.c:594 src/send_message.c:785
 msgid "Connection closed by the remote host."
 msgstr "���腴�筝紙����������ｇ�����"
 
-#: src/inc.c:1216
+#: src/inc.c:1261
 msgid "Mailbox is locked."
 msgstr "篆∞�怨群茴����絎�鐚������遵��筝�罨≧�桁�����絎�������"
 
-#: src/inc.c:1220
+#: src/inc.c:1265
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "篆∞�怨群茴����絎�鐚�%s"
 
-#: src/inc.c:1226 src/send_message.c:770
+#: src/inc.c:1271 src/send_message.c:770
 msgid "Authentication failed."
 msgstr "茯�茘�紊掩��"
 
-#: src/inc.c:1231 src/send_message.c:773
+#: src/inc.c:1276 src/send_message.c:773
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2795,15 +2795,15 @@ msgstr ""
 "茯�茘�紊掩��鐚�\n"
 "%s"
 
-#: src/inc.c:1236 src/send_message.c:789
+#: src/inc.c:1281 src/send_message.c:789
 msgid "Session timed out."
 msgstr "篏�罐���丈��"
 
-#: src/inc.c:1272
+#: src/inc.c:1317
 msgid "Incorporation cancelled\n"
 msgstr "���篏�綏峨��羔�\n"
 
-#: src/inc.c:1355
+#: src/inc.c:1400
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "緇� %s 筝����緇���灸散��上�� %s...\n"
@@ -3679,7 +3679,7 @@ msgstr "罟∽�ユ�����絽活�������育�灸散"
 msgid "Send queued message(s)"
 msgstr "絨����絖�莖����紊鞘賢�����灸散������"
 
-#: src/mainwindow.c:2393 src/prefs_account_dialog.c:555
+#: src/mainwindow.c:2393 src/prefs_account_dialog.c:558
 #: src/prefs_common_dialog.c:686 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "��医����灸散"
@@ -3720,62 +3720,62 @@ msgstr "�����ら�灸散"
 msgid "Set as junk mail"
 msgstr "罩檎����阪����冗�灸散"
 
-#: src/mainwindow.c:2468
+#: src/mainwindow.c:2470
 msgid "Execute"
 msgstr "��決��"
 
-#: src/mainwindow.c:2469
+#: src/mainwindow.c:2471
 msgid "Execute marked process"
 msgstr "��決��罔�荐����茵�腮�"
 
-#: src/mainwindow.c:2479
+#: src/mainwindow.c:2481
 msgid "Next unread message"
 msgstr "筝�筝�絨����莅���灸散"
 
-#: src/mainwindow.c:2491
+#: src/mainwindow.c:2493
 msgid "Prefs"
 msgstr "荐�絎�"
 
-#: src/mainwindow.c:2492
+#: src/mainwindow.c:2494
 msgid "Common preferences"
 msgstr "筝����荐�絎�"
 
-#: src/mainwindow.c:2500 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2502 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "絽活��"
 
-#: src/mainwindow.c:2501
+#: src/mainwindow.c:2503
 msgid "Account setting"
 msgstr "絽活��荐�絎�"
 
-#: src/mainwindow.c:2673
+#: src/mainwindow.c:2675
 msgid "You are offline. Click the icon to go online."
 msgstr "���������罩ｉ�∝��筝�������筝���������√奨��ｇ�����"
 
-#: src/mainwindow.c:2684
+#: src/mainwindow.c:2686
 msgid "You are online. Click the icon to go offline."
 msgstr "���������罩ｉ�ｇ��筝�������筝���������∝��綏ヤ�����"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit"
 msgstr "��∫��"
 
-#: src/mainwindow.c:2954
+#: src/mainwindow.c:2956
 msgid "Exit this program?"
 msgstr "���腆阪��荀���∫�����鐚�"
 
-#: src/mainwindow.c:3572
+#: src/mainwindow.c:3574
 #, fuzzy
 msgid "Command line options"
 msgstr "���荐�絎���決�����篁�"
 
-#: src/mainwindow.c:3585
+#: src/mainwindow.c:3587
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "���羈�鐚�%s [��檎��]...\n"
 
-#: src/mainwindow.c:3593
+#: src/mainwindow.c:3595
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3791,7 +3791,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3609
+#: src/mainwindow.c:3611
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3999,418 +3999,423 @@ msgstr ""
 "筝���句��絲�腆主��茯�! 茫����荅�筝�罨�...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:438
+#: src/prefs_account_dialog.c:441
 msgid "Opening account preferences window...\n"
 msgstr "������絽活��荐�絎����荀�腦�...\n"
 
-#: src/prefs_account_dialog.c:478
+#: src/prefs_account_dialog.c:481
 #, c-format
 msgid "Account%d"
 msgstr "絽活�� %d"
 
-#: src/prefs_account_dialog.c:499
+#: src/prefs_account_dialog.c:502
 msgid "Preferences for new account"
 msgstr "��医験���荐�絎�"
 
-#: src/prefs_account_dialog.c:508
+#: src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "絽活��荐�絎�"
 
-#: src/prefs_account_dialog.c:531
+#: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "��∝��絽活��荐�絎����荀�腦�...\n"
 
-#: src/prefs_account_dialog.c:551 src/prefs_common_dialog.c:682
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:682
 msgid "Receive"
 msgstr "�･��区┃絎�"
 
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:693
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:693
 msgid "Privacy"
 msgstr "腱�篋肴�����"
 
-#: src/prefs_account_dialog.c:562
+#: src/prefs_account_dialog.c:565
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:565 src/prefs_common_dialog.c:2192
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2192
 msgid "Advanced"
 msgstr "��臥��荐�絎�"
 
-#: src/prefs_account_dialog.c:621
+#: src/prefs_account_dialog.c:624
 msgid "Name of this account"
 msgstr "������絽活��������腮�"
 
-#: src/prefs_account_dialog.c:630
+#: src/prefs_account_dialog.c:633
 msgid "Set as default"
 msgstr "荐���咲��荐�絽活��"
 
-#: src/prefs_account_dialog.c:634
+#: src/prefs_account_dialog.c:637
 msgid "Personal information"
 msgstr "���篋肴��荐�"
 
-#: src/prefs_account_dialog.c:643
+#: src/prefs_account_dialog.c:646
 msgid "Full name"
 msgstr "������"
 
-#: src/prefs_account_dialog.c:649
+#: src/prefs_account_dialog.c:652
 msgid "Mail address"
 msgstr "��糸����灸散��医��"
 
-#: src/prefs_account_dialog.c:655
+#: src/prefs_account_dialog.c:658
 msgid "Organization"
 msgstr "������������/腟�膵�"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:682
 msgid "Server information"
 msgstr "篌堺�����莖�荐�"
 
-#: src/prefs_account_dialog.c:700 src/prefs_account_dialog.c:856
-#: src/prefs_account_dialog.c:1537
+#: src/prefs_account_dialog.c:703 src/prefs_account_dialog.c:860
+#: src/prefs_account_dialog.c:1544
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:702 src/prefs_account_dialog.c:964
-#: src/prefs_account_dialog.c:1554 src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:705 src/prefs_account_dialog.c:968
+#: src/prefs_account_dialog.c:1561 src/prefs_account_dialog.c:1743
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:707
 msgid "News (NNTP)"
 msgstr "��域�� (NNTP)"
 
-#: src/prefs_account_dialog.c:706
+#: src/prefs_account_dialog.c:709
 msgid "None (local)"
 msgstr "��� (local)"
 
-#: src/prefs_account_dialog.c:719
+#: src/prefs_account_dialog.c:722
 msgid "This server requires authentication"
 msgstr "������篌堺��������荀�茯�茘�"
 
-#: src/prefs_account_dialog.c:758
+#: src/prefs_account_dialog.c:761
 msgid "News server"
 msgstr "��域��篌堺�����"
 
-#: src/prefs_account_dialog.c:764
+#: src/prefs_account_dialog.c:767
 msgid "Server for receiving"
 msgstr "�･��狗�灸散篌堺�����"
 
-#: src/prefs_account_dialog.c:770
+#: src/prefs_account_dialog.c:773
 msgid "SMTP server (send)"
 msgstr "SMTP ��灸散篌堺����� (��寂拭)"
 
-#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:780 src/prefs_account_dialog.c:1168
 msgid "User ID"
 msgstr "絽活��"
 
-#: src/prefs_account_dialog.c:783 src/prefs_account_dialog.c:1170
+#: src/prefs_account_dialog.c:786 src/prefs_account_dialog.c:1177
 msgid "Password"
 msgstr "絲�腆�"
 
-#: src/prefs_account_dialog.c:864
+#: src/prefs_account_dialog.c:868
 msgid "Use secure authentication (APOP)"
 msgstr "篏睡��絎����茯�茘�鐚�APOP鐚�"
 
-#: src/prefs_account_dialog.c:867
+#: src/prefs_account_dialog.c:871
 msgid "Remove messages on server when received"
 msgstr "�･��狗�灸散���筝�篏球��篌堺�����筝�腱脂�ゃ��"
 
-#: src/prefs_account_dialog.c:878
+#: src/prefs_account_dialog.c:882
 msgid "Remove after"
 msgstr "���綛上ぉ緇�腱脂�わ��"
 
-#: src/prefs_account_dialog.c:887
+#: src/prefs_account_dialog.c:891
 msgid "days"
 msgstr "紊�"
 
-#: src/prefs_account_dialog.c:904
+#: src/prefs_account_dialog.c:908
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(荐���� 0 �����榊����括Щ���)"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:918
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "�･��銀失������筝������������灸散���"
 
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:924
 msgid "Receive size limit"
 msgstr "�･��狗�灸散紊у��������"
 
-#: src/prefs_account_dialog.c:927 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:934
+#: src/prefs_account_dialog.c:938
 msgid "Filter messages on receiving"
 msgstr "�･��狗�灸散�����画�����羶�"
 
-#: src/prefs_account_dialog.c:942
+#: src/prefs_account_dialog.c:946
 msgid "Default inbox"
 msgstr "���荐������銀散紊�"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:966
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "���膓����羶丞����灸散絨����茴�絖���育�����莖����紊鞘賢���"
 
-#: src/prefs_account_dialog.c:975 src/prefs_account_dialog.c:1131
+#: src/prefs_account_dialog.c:979 src/prefs_account_dialog.c:1138
 msgid "Authentication method"
 msgstr "茯�茘���号��"
 
-#: src/prefs_account_dialog.c:985 src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
 #: src/prefs_common_dialog.c:900 src/prefs_common_dialog.c:2579
 msgid "Automatic"
 msgstr "������"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:997
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "�Û����������九����灸散���蕁�腓�"
 
-#: src/prefs_account_dialog.c:995
+#: src/prefs_account_dialog.c:999
+#, fuzzy
+msgid "Filter new messages in INBOX on receiving"
+msgstr "�･��狗�灸散�����画�����羶�"
+
+#: src/prefs_account_dialog.c:1001
 msgid "News"
 msgstr "��域��"
 
-#: src/prefs_account_dialog.c:1007
+#: src/prefs_account_dialog.c:1013
 msgid "Maximum number of articles to download"
 msgstr "筝�罨≧��紊�筝�莠����腴���檎��"
 
-#: src/prefs_account_dialog.c:1024
+#: src/prefs_account_dialog.c:1030
 msgid "No limit if 0 is specified."
 msgstr "荐���� 0 ���筝������倶�檎�����"
 
-#: src/prefs_account_dialog.c:1028
+#: src/prefs_account_dialog.c:1034
 msgid "`Get all' checks for new messages on this account"
 msgstr "���������罟∽�ャ�����罟∽�ラ�����絽活�������育�灸散"
 
-#: src/prefs_account_dialog.c:1081 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "��灸散罔����荐�絎�"
 
-#: src/prefs_account_dialog.c:1088
+#: src/prefs_account_dialog.c:1095
 msgid "Add Date header field"
 msgstr "�����ユ�ユ��"
 
-#: src/prefs_account_dialog.c:1089
+#: src/prefs_account_dialog.c:1096
 msgid "Generate Message-ID"
 msgstr "��∝����灸散茘���ョ⊆"
 
-#: src/prefs_account_dialog.c:1096
+#: src/prefs_account_dialog.c:1103
 msgid "Add user-defined header"
 msgstr "�����ヤ戎������絎�臂����罔����"
 
-#: src/prefs_account_dialog.c:1098 src/prefs_common_dialog.c:1609
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1609
 #: src/prefs_common_dialog.c:1636
 msgid " Edit... "
 msgstr " 膩�莠�... "
 
-#: src/prefs_account_dialog.c:1108
+#: src/prefs_account_dialog.c:1115
 msgid "Authentication"
 msgstr "茯�茘�"
 
-#: src/prefs_account_dialog.c:1116
+#: src/prefs_account_dialog.c:1123
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP 茯�茘� (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1192
+#: src/prefs_account_dialog.c:1199
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "��ユ��罩ゆ��腥榊�緒��絨�篏睡���･��倶�����絽活�����絲�腆若��"
 
-#: src/prefs_account_dialog.c:1205
+#: src/prefs_account_dialog.c:1212
 msgid "Authenticate with POP3 before sending"
 msgstr "���篆≦�������� POP3 茯�茘�"
 
-#: src/prefs_account_dialog.c:1251
+#: src/prefs_account_dialog.c:1258
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1285
+#: src/prefs_account_dialog.c:1292
 msgid "Command output"
 msgstr "��巡擦莠後��"
 
-#: src/prefs_account_dialog.c:1306 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "�����檎��罨�篏�筝������������ヤ�������糸����灸散篆∞�縁��"
 
-#: src/prefs_account_dialog.c:1315
+#: src/prefs_account_dialog.c:1322
 msgid "Cc"
 msgstr "茲����"
 
-#: src/prefs_account_dialog.c:1328
+#: src/prefs_account_dialog.c:1335
 msgid "Bcc"
 msgstr "絲�篁区�����"
 
-#: src/prefs_account_dialog.c:1341
+#: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
 msgstr "���篆≦�医��"
 
-#: src/prefs_account_dialog.c:1396
+#: src/prefs_account_dialog.c:1403
 msgid "Sign message by default"
 msgstr "��灸散�����������娯��膂順��"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1405
 msgid "Encrypt message by default"
 msgstr "��灸散���������絲�"
 
-#: src/prefs_account_dialog.c:1400
+#: src/prefs_account_dialog.c:1407
 msgid "Encrypt when replying to encrypted message"
 msgstr "���荀����絲���灸散���箙���画�����絲�"
 
-#: src/prefs_account_dialog.c:1402
+#: src/prefs_account_dialog.c:1409
 msgid "Use ASCII-armored format for encryption"
 msgstr "篏睡�� ASCII-armored ��弱��������絲�"
 
-#: src/prefs_account_dialog.c:1404
+#: src/prefs_account_dialog.c:1411
 msgid "Use clear text signature"
 msgstr "篏睡�����腆主綾腴�"
 
-#: src/prefs_account_dialog.c:1409
+#: src/prefs_account_dialog.c:1416
 msgid "Sign key"
 msgstr "膂順��������"
 
-#: src/prefs_account_dialog.c:1417
+#: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
 msgstr "篏睡�����荐���� GnuPG ������"
 
-#: src/prefs_account_dialog.c:1426
+#: src/prefs_account_dialog.c:1433
 msgid "Select key by your email address"
 msgstr "��号��篏������糸����灸散��医����御��������"
 
-#: src/prefs_account_dialog.c:1435
+#: src/prefs_account_dialog.c:1442
 msgid "Specify key manually"
 msgstr "���������絎�������"
 
-#: src/prefs_account_dialog.c:1451
+#: src/prefs_account_dialog.c:1458
 msgid "User or key ID:"
 msgstr "篏睡�����篁ｈ����������亥��茘���ョ⊆鐚�"
 
-#: src/prefs_account_dialog.c:1545 src/prefs_account_dialog.c:1562
-#: src/prefs_account_dialog.c:1578 src/prefs_account_dialog.c:1596
+#: src/prefs_account_dialog.c:1552 src/prefs_account_dialog.c:1569
+#: src/prefs_account_dialog.c:1585 src/prefs_account_dialog.c:1603
 msgid "Don't use SSL"
 msgstr "筝�篏睡�� SSL"
 
-#: src/prefs_account_dialog.c:1548
+#: src/prefs_account_dialog.c:1555
 msgid "Use SSL for POP3 connection"
 msgstr "POP3 ��ｇ�����篏睡�� SSL"
 
-#: src/prefs_account_dialog.c:1551 src/prefs_account_dialog.c:1568
-#: src/prefs_account_dialog.c:1602
+#: src/prefs_account_dialog.c:1558 src/prefs_account_dialog.c:1575
+#: src/prefs_account_dialog.c:1609
 msgid "Use STARTTLS command to start SSL session"
 msgstr "��� STARTTLS ��巡擦箴������� SSL"
 
-#: src/prefs_account_dialog.c:1565
+#: src/prefs_account_dialog.c:1572
 msgid "Use SSL for IMAP4 connection"
 msgstr "IMAP4 ��ｇ�����篏睡�� SSL"
 
-#: src/prefs_account_dialog.c:1571
+#: src/prefs_account_dialog.c:1578
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1586
+#: src/prefs_account_dialog.c:1593
 msgid "Use SSL for NNTP connection"
 msgstr "NNTP ��ｇ�����篏睡�� SSL"
 
-#: src/prefs_account_dialog.c:1588
+#: src/prefs_account_dialog.c:1595
 msgid "Send (SMTP)"
 msgstr "���篆∴┃絎� (SMTP)"
 
-#: src/prefs_account_dialog.c:1599
+#: src/prefs_account_dialog.c:1606
 msgid "Use SSL for SMTP connection"
 msgstr "SMTP ��ｇ�����篏睡�� SSL"
 
-#: src/prefs_account_dialog.c:1610
+#: src/prefs_account_dialog.c:1617
 msgid "Use non-blocking SSL"
 msgstr "篏睡�� non-blocking SSL"
 
-#: src/prefs_account_dialog.c:1613
+#: src/prefs_account_dialog.c:1620
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "��ユ��篏睡�� SSL ��ｇ�������主����馹�鐚�茫�������罩ら�檎�����"
 
-#: src/prefs_account_dialog.c:1703
+#: src/prefs_account_dialog.c:1710
 msgid "Specify SMTP port"
 msgstr "���絎� SMTP ��ｆ･���"
 
-#: src/prefs_account_dialog.c:1709
+#: src/prefs_account_dialog.c:1716
 msgid "Specify POP3 port"
 msgstr "���絎� POP3 ��ｆ･���"
 
-#: src/prefs_account_dialog.c:1715
+#: src/prefs_account_dialog.c:1722
 msgid "Specify IMAP4 port"
 msgstr "���絎� IMAP4 ��ｆ･���"
 
-#: src/prefs_account_dialog.c:1721
+#: src/prefs_account_dialog.c:1728
 msgid "Specify NNTP port"
 msgstr "���絎� NNTP ��ｆ･���"
 
-#: src/prefs_account_dialog.c:1726
+#: src/prefs_account_dialog.c:1733
 msgid "Specify domain name"
 msgstr "���絎�膓峨��"
 
-#: src/prefs_account_dialog.c:1747
+#: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
 msgstr "IMAP 篌堺�����������"
 
-#: src/prefs_account_dialog.c:1757
+#: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1760
+#: src/prefs_account_dialog.c:1767
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "�･��銀失������筝������������灸散���"
 
-#: src/prefs_account_dialog.c:1805
+#: src/prefs_account_dialog.c:1812
 msgid "Put sent messages in"
 msgstr "絨�綏臥����坂����灸散絖����"
 
-#: src/prefs_account_dialog.c:1807
+#: src/prefs_account_dialog.c:1814
 msgid "Put draft messages in"
 msgstr "絨���灸散���腮水�����"
 
-#: src/prefs_account_dialog.c:1809
+#: src/prefs_account_dialog.c:1816
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "絨������ら�灸散絖����"
 
-#: src/prefs_account_dialog.c:1811
+#: src/prefs_account_dialog.c:1818
 msgid "Put deleted messages in"
 msgstr "絨������ら�灸散絖����"
 
-#: src/prefs_account_dialog.c:1875
+#: src/prefs_account_dialog.c:1882
 msgid "Account name is not entered."
 msgstr "���莠後�ュ験������腮宴��"
 
-#: src/prefs_account_dialog.c:1879
+#: src/prefs_account_dialog.c:1886
 msgid "Mail address is not entered."
 msgstr "���莠後�ラ�糸����灸散篆∞�宴��"
 
-#: src/prefs_account_dialog.c:1884
+#: src/prefs_account_dialog.c:1891
 msgid "SMTP server is not entered."
 msgstr "���莠後�ョ�守����灸散篌堺��������"
 
-#: src/prefs_account_dialog.c:1889
+#: src/prefs_account_dialog.c:1896
 msgid "User ID is not entered."
 msgstr "���莠後�ヤ戎������絽活�����"
 
-#: src/prefs_account_dialog.c:1894
+#: src/prefs_account_dialog.c:1901
 msgid "POP3 server is not entered."
 msgstr "���莠後�ユ･��狗�灸散篌堺��������"
 
-#: src/prefs_account_dialog.c:1899
+#: src/prefs_account_dialog.c:1906
 msgid "IMAP4 server is not entered."
 msgstr "���莠後�ユ･��狗�灸散篌堺��������"
 
-#: src/prefs_account_dialog.c:1904
+#: src/prefs_account_dialog.c:1911
 msgid "NNTP server is not entered."
 msgstr "���莠後�ユ�域��篌堺��������"
 
-#: src/prefs_account_dialog.c:1930
+#: src/prefs_account_dialog.c:1937
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2040
+#: src/prefs_account_dialog.c:2047
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -6653,31 +6658,31 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1982
+#: src/textview.c:1986
 msgid "Sa_ve this image as..."
 msgstr "�������Ϊ����井��(_V)..."
 
-#: src/textview.c:1998 src/trayicon.c:158
+#: src/textview.c:2002 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "膩�絲���育�灸散(_N)"
 
-#: src/textview.c:2000
+#: src/textview.c:2004
 msgid "Add to address _book..."
 msgstr "絨�絲�篆＞査�����ラ��荐����(_B)..."
 
-#: src/textview.c:2002
+#: src/textview.c:2006
 msgid "Copy this add_ress"
 msgstr "茲�茖醇�ら��荐���医��(_R)"
 
-#: src/textview.c:2005
+#: src/textview.c:2009
 msgid "_Open with Web browser"
 msgstr "篁ョ�頳遵��������(_O)"
 
-#: src/textview.c:2007
+#: src/textview.c:2011
 msgid "Copy this _link"
 msgstr "茲�茖醇�ら�ｆ･(_L)"
 
-#: src/textview.c:2150
+#: src/textview.c:2154
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6689,7 +6694,7 @@ msgstr ""
 "\n"
 "腆阪��荀����������鐚�"
 
-#: src/textview.c:2155
+#: src/textview.c:2159
 msgid "Fake URL warning"
 msgstr "������ URL 茘����荐����"
 
diff --git a/src/prefs_account_dialog.c b/src/prefs_account_dialog.c
index 77b8b63d..6dcc9576 100644
--- a/src/prefs_account_dialog.c
+++ b/src/prefs_account_dialog.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -97,6 +97,7 @@ static struct Receive {
 	GtkWidget *imap_frame;
 	GtkWidget *imap_auth_type_optmenu;
 	GtkWidget *imap_check_inbox_chkbtn;
+	GtkWidget *imap_filter_inbox_chkbtn;
 
 	GtkWidget *nntp_frame;
 	GtkWidget *maxarticle_spinbtn;
@@ -267,6 +268,8 @@ static PrefsUIData ui_data[] = {
 	 prefs_set_data_from_entry, prefs_set_entry},
 	{"imap_check_inbox_only", &receive.imap_check_inbox_chkbtn,
 	 prefs_set_data_from_toggle, prefs_set_toggle},
+	{"imap_filter_inbox_on_receive", &receive.imap_filter_inbox_chkbtn,
+	 prefs_set_data_from_toggle, prefs_set_toggle},
 	{"imap_auth_method", &receive.imap_auth_type_optmenu,
 	 prefs_account_imap_auth_type_set_data_from_optmenu,
 	 prefs_account_imap_auth_type_set_optmenu},
@@ -839,6 +842,7 @@ static void prefs_account_receive_create(void)
 	GtkWidget *optmenu_menu;
 	GtkWidget *menuitem;
 	GtkWidget *imap_check_inbox_chkbtn;
+	GtkWidget *imap_filter_inbox_chkbtn;
 
 	GtkWidget *nntp_frame;
 	GtkWidget *maxarticle_label;
@@ -991,6 +995,8 @@ static void prefs_account_receive_create(void)
 
 	PACK_CHECK_BUTTON (vbox2, imap_check_inbox_chkbtn,
 			   _("Only check INBOX on receiving"));
+	PACK_CHECK_BUTTON (vbox2, imap_filter_inbox_chkbtn,
+			   _("Filter new messages in INBOX on receiving"));
 
 	PACK_FRAME (vbox1, nntp_frame, _("News"));
 
@@ -1039,9 +1045,10 @@ static void prefs_account_receive_create(void)
 	receive.inbox_entry           = inbox_entry;
 	receive.inbox_btn             = inbox_btn;
 
-	receive.imap_frame              = imap_frame;
-	receive.imap_auth_type_optmenu  = optmenu;
-	receive.imap_check_inbox_chkbtn = imap_check_inbox_chkbtn;
+	receive.imap_frame               = imap_frame;
+	receive.imap_auth_type_optmenu   = optmenu;
+	receive.imap_check_inbox_chkbtn  = imap_check_inbox_chkbtn;
+	receive.imap_filter_inbox_chkbtn = imap_filter_inbox_chkbtn;
 
 	receive.nntp_frame             = nntp_frame;
 	receive.maxarticle_spinbtn     = maxarticle_spinbtn;
diff --git a/src/prefs_account_dialog.h b/src/prefs_account_dialog.h
index 2a95d495..0fbea98d 100644
--- a/src/prefs_account_dialog.h
+++ b/src/prefs_account_dialog.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/textview.c b/src/textview.c
index 051e8f3a..f19925ff 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/textview.h b/src/textview.h
index 57382d39..52fa98db 100644
--- a/src/textview.h
+++ b/src/textview.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2005 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by